GDT: revert cc_scub annotations (#6274)

Author: maksymmalyhin

GoogleDataTransport/GDTCCTLibrary/GDTCCTUploader.m

@@ -50,10 +50,8 @@
 /** */
 static NSString *const kLibraryDataFLLNextUploadTimeKey = @"GDTCCTUploaderFLLNextUploadTimeKey";
 
-// copybara:insert_begin(Reserve private endpoint)
-// static NSString *const kINTServerURL =
-//    @"https://dummyapiverylong-dummy.dummy.com/dummy/api/very/long";
-// copybara:insert_end
+static NSString *const kINTServerURL =
+    @"https://dummyapiverylong-dummy.dummy.com/dummy/api/very/long";
 
 #if !NDEBUG
 NSNotificationName const GDTCCTUploadCompleteNotification = @"com.GDTCCTUploader.UploadComplete";
@@ -87,9 +85,7 @@ + (void)load {
   [[GDTCORRegistrar sharedInstance] registerUploader:uploader target:kGDTCORTargetCCT];
   [[GDTCORRegistrar sharedInstance] registerUploader:uploader target:kGDTCORTargetFLL];
   [[GDTCORRegistrar sharedInstance] registerUploader:uploader target:kGDTCORTargetCSH];
-  // copybara:insert_begin(Reserve private endpoint)
-  //  [[GDTCORRegistrar sharedInstance] registerUploader:uploader target:kGDTCORTargetINT];
-  // copybara:insert_end
+  [[GDTCORRegistrar sharedInstance] registerUploader:uploader target:kGDTCORTargetINT];
 }
 
 + (instancetype)sharedInstance {
@@ -183,10 +179,8 @@ - (nullable NSURL *)serverURLForTarget:(GDTCORTarget)target {
     case kGDTCORTargetCSH:
       return CSHServerURL;
 
-      /* copybara:insert(Reserve private endpoint)
-      case kGDTCORTargetINT:
-        return [NSURL URLWithString:kINTServerURL];
-      */
+    case kGDTCORTargetINT:
+      return [NSURL URLWithString:kINTServerURL];
 
     default:
       GDTCORLogDebug(@"GDTCCTUploader doesn't support target %ld", (long)target);
@@ -373,10 +367,8 @@ - (void)handleURLResponse:(nullable NSURLResponse *)response
 
     case kGDTCORTargetFLL:
       // Falls through.
-      // copybara:insert_begin(Reserve private endpoint)
-      //    case kGDTCORTargetINT:
-      //      // Falls through.
-      // copybara:insert_end
+    case kGDTCORTargetINT:
+      // Falls through.
     case kGDTCORTargetCSH:
       self->_FLLNextUploadTime = futureUploadTime;
       break;
@@ -519,13 +511,11 @@ - (BOOL)readyToUploadTarget:(GDTCORTarget)target conditions:(GDTCORUploadConditi
     return YES;
   }
 
-  // copybara:insert_begin(Reserve private endpoint)
-  //  if (target == kGDTCORTargetINT) {
-  //    GDTCORLogDebug(@"%@", @"CCT: kGDTCORTargetINT events are allowed to be "
-  //                          @"uploaded straight away.");
-  //    return YES;
-  //  }
-  // copybara:insert_end
+  if (target == kGDTCORTargetINT) {
+    GDTCORLogDebug(@"%@", @"CCT: kGDTCORTargetINT events are allowed to be "
+                          @"uploaded straight away.");
+    return YES;
+  }
 
   // Upload events with no additional conditions if high priority.
   if ((conditions & GDTCORUploadConditionHighPriority) == GDTCORUploadConditionHighPriority) {
@@ -614,11 +604,9 @@ - (nullable NSURLRequest *)constructRequestForTarget:(GDTCORTarget)target data:(
     case kGDTCORTargetCSH:
       targetString = @"csh";
       break;
-      // copybara:insert_begin(Reserve private endpoint)
-      //    case kGDTCORTargetINT:
-      //      targetString = @"int";
-      //      break;
-      // copybara:insert_end
+    case kGDTCORTargetINT:
+      targetString = @"int";
+      break;
 
     default:
       targetString = @"unknown";
@@ -630,11 +618,11 @@ - (nullable NSURLRequest *)constructRequestForTarget:(GDTCORTarget)target data:(
   if (target == kGDTCORTargetFLL || target == kGDTCORTargetCSH) {
     [request setValue:[self FLLAndCSHandINTAPIKey] forHTTPHeaderField:@"X-Goog-Api-Key"];
   }
-  /* copybara:insert(Reserve private endpoint)
-   if (target == kGDTCORTargetINT) {
-     [request setValue:[self FLLAndCSHandINTAPIKey] forHTTPHeaderField:@"X-Goog-Api-Key"];
-   }
-   */
+
+  if (target == kGDTCORTargetINT) {
+    [request setValue:[self FLLAndCSHandINTAPIKey] forHTTPHeaderField:@"X-Goog-Api-Key"];
+  }
+
   if ([GDTCCTCompressionHelper isGzipped:data]) {
     [request setValue:@"gzip" forHTTPHeaderField:@"Content-Encoding"];
   }

GoogleDataTransport/GDTCCTTests/Unit/GDTCCTUploaderTest.m

@@ -492,14 +492,12 @@ - (void)testUploadTarget_WhenBeforeServerNextUploadTimeForOtherTargets_ThenUploa
                          shouldWaitForNextRequestTime:NO
                                         expectRequest:YES];
 
-  /* copybara:insert(Reserve private endpoint)
   [self assertUploadTargetRespectsNextRequestWaitTime:60
-                     forTarget:kGDTCORTargetINT
-                           QoS:GDTCOREventQosDefault
-                    conditions:GDTCORUploadConditionWifiData
-  shouldWaitForNextRequestTime:NO
-                 expectRequest:YES];
-   */
+                                            forTarget:kGDTCORTargetINT
+                                                  QoS:GDTCOREventQosDefault
+                                           conditions:GDTCORUploadConditionWifiData
+                         shouldWaitForNextRequestTime:NO
+                                        expectRequest:YES];
 }
 
 - (void)testUploadTarget_WhenAfterServerNextUploadTimeForCCTAndFLLTargets_ThenUpload {

GoogleDataTransport/GDTCORLibrary/GDTCORFlatFileStorage.m

@@ -58,9 +58,7 @@ + (void)load {
   [[GDTCORRegistrar sharedInstance] registerStorage:[self sharedInstance] target:kGDTCORTargetCCT];
   [[GDTCORRegistrar sharedInstance] registerStorage:[self sharedInstance] target:kGDTCORTargetFLL];
   [[GDTCORRegistrar sharedInstance] registerStorage:[self sharedInstance] target:kGDTCORTargetCSH];
-  /* copybara:insert(Reserve private endpoint)
   [[GDTCORRegistrar sharedInstance] registerStorage:[self sharedInstance] target:kGDTCORTargetINT];
-  */
 
   // Sets a global translation mapping to decode GDTCORStoredEvent objects encoded as instances of
   // GDTCOREvent instead. Then we do the same thing with GDTCORStorage. This must be done in load

GoogleDataTransport/GDTCORLibrary/Public/GoogleDataTransport/GDTCORTargets.h

@@ -35,8 +35,6 @@ typedef NS_ENUM(NSInteger, GDTCORTarget) {
    */
   kGDTCORTargetCSH = 1002,
 
-  // copybara:insert_begin(Reserve private endpoint)
-  //  /** The INT target. */
-  //  kGDTCORTargetINT = 1003,
-  // copybara:insert_end
+  /** The INT target. */
+  kGDTCORTargetINT = 1003,
 };