Rename CHROME_SYNC_SERVICE to CHROME_SYNC_EVENT_LOGGER

Bug: 788004
Change-Id: I455ac63969e5ab52ef063fbd1b9ba14be833f211
Reviewed-on: https://chromium-review.googlesource.com/806653Reviewed-by: Steven Holte <holte@chromium.org>
Reviewed-by: Pavel Yatsuk <pavely@chromium.org>
Commit-Queue: Sky Malice <skym@chromium.org>
Cr-Commit-Position: refs/heads/master@{#521555}

chrome/browser/sync/test/integration/single_client_user_events_sync_test.cc

@@ -300,7 +300,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientUserEventsSyncTest, FieldTrial) {
   const std::string group_name = "GroupName";
 
   ASSERT_TRUE(SetupSync());
-  variations::AssociateGoogleVariationID(variations::CHROME_SYNC_SERVICE,
+  variations::AssociateGoogleVariationID(variations::CHROME_SYNC_EVENT_LOGGER,
                                          trial_name, group_name, 123);
   base::FieldTrialList::CreateFieldTrial(trial_name, group_name);
   base::FieldTrialList::FindFullName(trial_name);

components/sync/user_events/trial_recorder.cc

@@ -37,7 +37,7 @@ base::TimeDelta GetFieldTrialDelay() {
 
 TrialRecorder::TrialRecorder(UserEventService* user_event_service)
     : user_event_service_(user_event_service),
-      variations_(variations::CHROME_SYNC_SERVICE,
+      variations_(variations::CHROME_SYNC_EVENT_LOGGER,
                   base::BindRepeating(&TrialRecorder::OnNewVariationId,
                                       base::Unretained(this))) {
   DCHECK(user_event_service_);

components/sync/user_events/trial_recorder_unittest.cc

@@ -47,7 +47,7 @@ void VerifyEvent(std::set<variations::VariationID> expected_variations,
 
 void SetupAndFinalizeTrial(const std::string& trial_name,
                            variations::VariationID id) {
-  variations::AssociateGoogleVariationID(variations::CHROME_SYNC_SERVICE,
+  variations::AssociateGoogleVariationID(variations::CHROME_SYNC_EVENT_LOGGER,
                                          trial_name, kGroup, id);
   base::FieldTrialList::CreateFieldTrial(trial_name, kGroup);
   base::FieldTrialList::FindFullName(trial_name);

components/sync/user_events/user_event_service_impl_unittest.cc

@@ -214,7 +214,7 @@ TEST_F(UserEventServiceImplTest, SessionIdIsDifferent) {
 }
 
 TEST_F(UserEventServiceImplTest, FieldTrial) {
-  variations::AssociateGoogleVariationID(variations::CHROME_SYNC_SERVICE,
+  variations::AssociateGoogleVariationID(variations::CHROME_SYNC_EVENT_LOGGER,
                                          "trial", "group", 123);
   base::FieldTrialList::CreateFieldTrial("trial", "group");
   base::FieldTrialList::FindFullName("trial");

components/variations/variations_associated_data.h

@@ -66,8 +66,8 @@ enum IDCollectionKey {
   // X-Client-Data header.
   GOOGLE_WEB_PROPERTIES_TRIGGER,
   // This collection is used by Chrome Sync services, transmitted through the
-  // Chrome Sync experiment labels.
-  CHROME_SYNC_SERVICE,
+  // Sync Event Logger.
+  CHROME_SYNC_EVENT_LOGGER,
   // The total count of collections.
   ID_COLLECTION_COUNT,
 };

components/variations/variations_associated_data_unittest.cc

@@ -166,21 +166,21 @@ TEST_F(VariationsAssociatedDataTest, CollectionsCoexist) {
   EXPECT_EQ(EMPTY_ID,
             GetIDForTrial(GOOGLE_WEB_PROPERTIES_TRIGGER, trial_true.get()));
   EXPECT_EQ(EMPTY_ID,
-            GetIDForTrial(CHROME_SYNC_SERVICE, trial_true.get()));
+            GetIDForTrial(CHROME_SYNC_EVENT_LOGGER, trial_true.get()));
 
   AssociateGoogleVariationID(GOOGLE_WEB_PROPERTIES, trial_true->trial_name(),
       default_name, TEST_VALUE_A);
   EXPECT_EQ(TEST_VALUE_A,
             GetIDForTrial(GOOGLE_WEB_PROPERTIES, trial_true.get()));
   EXPECT_EQ(EMPTY_ID,
-            GetIDForTrial(CHROME_SYNC_SERVICE, trial_true.get()));
+            GetIDForTrial(CHROME_SYNC_EVENT_LOGGER, trial_true.get()));
 
-  AssociateGoogleVariationID(CHROME_SYNC_SERVICE, trial_true->trial_name(),
-      default_name, TEST_VALUE_A);
+  AssociateGoogleVariationID(CHROME_SYNC_EVENT_LOGGER, trial_true->trial_name(),
+                             default_name, TEST_VALUE_A);
   EXPECT_EQ(TEST_VALUE_A,
             GetIDForTrial(GOOGLE_WEB_PROPERTIES, trial_true.get()));
   EXPECT_EQ(TEST_VALUE_A,
-            GetIDForTrial(CHROME_SYNC_SERVICE, trial_true.get()));
+            GetIDForTrial(CHROME_SYNC_EVENT_LOGGER, trial_true.get()));
 
   trial_true = CreateFieldTrial("d2", 10, default_name, &default_group_number);
   ASSERT_EQ(default_group_number, trial_true->group());
@@ -192,14 +192,14 @@ TEST_F(VariationsAssociatedDataTest, CollectionsCoexist) {
   EXPECT_EQ(TEST_VALUE_A,
             GetIDForTrial(GOOGLE_WEB_PROPERTIES_TRIGGER, trial_true.get()));
   EXPECT_EQ(EMPTY_ID,
-            GetIDForTrial(CHROME_SYNC_SERVICE, trial_true.get()));
+            GetIDForTrial(CHROME_SYNC_EVENT_LOGGER, trial_true.get()));
 
-  AssociateGoogleVariationID(CHROME_SYNC_SERVICE, trial_true->trial_name(),
-      default_name, TEST_VALUE_A);
+  AssociateGoogleVariationID(CHROME_SYNC_EVENT_LOGGER, trial_true->trial_name(),
+                             default_name, TEST_VALUE_A);
   EXPECT_EQ(TEST_VALUE_A,
             GetIDForTrial(GOOGLE_WEB_PROPERTIES_TRIGGER, trial_true.get()));
   EXPECT_EQ(TEST_VALUE_A,
-            GetIDForTrial(CHROME_SYNC_SERVICE, trial_true.get()));
+            GetIDForTrial(CHROME_SYNC_EVENT_LOGGER, trial_true.get()));
 }
 
 }  // namespace variations

components/variations/variations_http_header_provider.cc

@@ -229,7 +229,7 @@ std::string VariationsHttpHeaderProvider::GenerateBase64EncodedProto(
       case GOOGLE_WEB_PROPERTIES_TRIGGER:
         proto.add_trigger_variation_id(entry.first);
         break;
-      case CHROME_SYNC_SERVICE:
+      case CHROME_SYNC_EVENT_LOGGER:
       case ID_COLLECTION_COUNT:
         // These cases included to get full enum coverage for switch, so that
         // new enums introduce compiler warnings. Nothing to do for these.

components/variations/variations_seed_processor.cc

@@ -58,10 +58,8 @@ void RegisterVariationIds(const Study_Experiment& experiment,
   if (experiment.has_chrome_sync_experiment_id()) {
     const VariationID variation_id =
         static_cast<VariationID>(experiment.chrome_sync_experiment_id());
-    AssociateGoogleVariationIDForce(CHROME_SYNC_SERVICE,
-                                    trial_name,
-                                    experiment.name(),
-                                    variation_id);
+    AssociateGoogleVariationIDForce(CHROME_SYNC_EVENT_LOGGER, trial_name,
+                                    experiment.name(), variation_id);
   }
 }