Remove unused transport field (#5770)

Author: rlazo

transport/transport-backend-cct/src/main/java/com/google/android/datatransport/cct/CctTransportBackend.java

@@ -297,9 +297,6 @@ private BatchedLogRequest getRequestBody(BackendRequest backendRequest) {
                   .setProductIdOrigin(ComplianceData.ProductIdOrigin.EVENT_OVERRIDE)
                   .build());
         }
-        if (eventInternal.getPseudonymousId() != null) {
-          event.setZwiebackCookieOverride(eventInternal.getPseudonymousId());
-        }
 
         if (eventInternal.getExperimentIdsClear() != null
             || eventInternal.getExperimentIdsEncrypted() != null) {

transport/transport-backend-cct/src/main/java/com/google/android/datatransport/cct/internal/LogEvent.java

@@ -47,9 +47,6 @@ public abstract class LogEvent {
   @Nullable
   public abstract ExperimentIds getExperimentIds();
 
-  @Nullable
-  public abstract String getZwiebackCookieOverride();
-
   @NonNull
   public static Builder protoBuilder(@NonNull byte[] sourceExtension) {
     return builder().setSourceExtension(sourceExtension);
@@ -93,9 +90,6 @@ public abstract static class Builder {
     @NonNull
     public abstract Builder setExperimentIds(@Nullable ExperimentIds value);
 
-    @NonNull
-    public abstract Builder setZwiebackCookieOverride(@Nullable String value);
-
     @NonNull
     public abstract LogEvent build();
   }

transport/transport-backend-cct/src/test/java/com/google/android/datatransport/cct/CctTransportBackendTest.java

@@ -208,11 +208,6 @@ public void testCCTSuccessLoggingRequest() {
                     String.format(
                         "$[?(@.logRequest[0].logEvent[1].complianceData.privacyContext.prequest.originAssociatedProductId == %s)]",
                         PRODUCT_ID)))
-            .withRequestBody(
-                matchingJsonPath(
-                    String.format(
-                        "$[?(@.logRequest[0].logEvent[1].zwiebackCookieOverride == \"%s\")]",
-                        PSEUDONYMOUS_ID)))
             .withRequestBody(
                 matchingJsonPath(
                     String.format(

transport/transport-backend-cct/src/test/java/com/google/android/datatransport/cct/internal/LogRequestTest.java

@@ -193,7 +193,6 @@ public void testLogRequest_jsontToProto() throws InvalidProtocolBufferException
             .setEventTimeMs(100L)
             .setEventUptimeMs(4000L)
             .setTimezoneOffsetSeconds(123)
-            .setZwiebackCookieOverride("override")
             .setExperimentIds(
                 ExperimentIds.builder()
                     .setClearBlob("blob".getBytes(StandardCharsets.UTF_8))
@@ -253,7 +252,6 @@ public void testLogRequest_jsontToProto() throws InvalidProtocolBufferException
                             .setEventUptimeMs(4000L)
                             .setEventTimeMs(100L)
                             .setTimezoneOffsetSeconds(123L)
-                            .setZwiebackCookieOverride("override")
                             .setExperimentIds(
                                 com.google.android.datatransport.cct.proto.ExperimentIds
                                     .newBuilder()

transport/transport-backend-cct/src/test/proto/google/cct/google_cct.proto

@@ -26,8 +26,6 @@ message LogEvent {
 
     int64 event_uptime_ms = 17;
 
-    string zwieback_cookie_override = 28;
-
     ExperimentIds experiment_ids = 16;
 
     oneof ext {