Initial clear server data impl

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/test/integration/sync_test.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <limits>
@@ skipping 213 matching lines @@
     case TWO_CLIENT:
     case TWO_CLIENT_LEGACY: {
       num_clients_ = 2;
       break;
     }
     default:
       NOTREACHED() << "Invalid test type specified.";
   }
 }
 
-SyncTest::~SyncTest() {}
+SyncTest::~SyncTest() {
+  sync_datatype_helper::DissociateWithTest(this);
+}
 
 void SyncTest::SetUp() {
   // Sets |server_type_| if it wasn't specified by the test.
   DecideServerType();
 
   base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
   if (cl->HasSwitch(switches::kPasswordFileForTest)) {
     ReadPasswordFile();
   } else {
     // Decide on username to use or create one.
@@ skipping 98 matching lines @@
   } else {
     // Create new profiles in user data dir so that other profiles can know
     // about it. This is needed in tests such as supervised user cases which
     // assume browser->profile() as the custodian profile.
     base::FilePath user_data_dir;
     PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
     CHECK(
       tmp_profile_paths_[index]->CreateUniqueTempDirUnderPath(user_data_dir));
   }
   base::FilePath profile_path = tmp_profile_paths_[index]->GetPath();
+  LOG(WARNING) << "PROFILE PATH " << profile_path.value();

[skym, 2017/03/07 18:38:22]

Should this be DVLOG? Did you mean to remove this? Also, the ALL CAPS is kind of
odd if you want to keep this logging as DVLOG.

[wylieb, 2017/03/07 19:52:23]

Done.

   if (UsingExternalServers()) {
     // If running against an EXTERNAL_LIVE_SERVER, we signin profiles using real
     // GAIA server. This requires creating profiles with no test hooks.
     InitializeProfile(index, MakeProfileForUISignin(profile_path));
   } else {
     // Without need of real GAIA authentication, we create new test profiles.
     // For test profiles, a custom delegate needs to be used to do the
     // initialization work before the profile is registered.
     profile_delegates_[index] =
         base::MakeUnique<SyncProfileDelegate>(base::Bind(
@@ skipping 241 matching lines @@
 
 bool SyncTest::SetupSync() {
   // Create sync profiles and clients if they haven't already been created.
   if (profiles_.empty()) {
     if (!SetupClients()) {
       LOG(FATAL) << "SetupClients() failed.";
       return false;
     }
   }
 
-  // Sync each of the profiles.
-  for (int i = 0; i < num_clients_; ++i) {
-    if (!GetClient(i)->SetupSync()) {
+  if (UsingExternalServers()) {
+    DVLOG(1) << "Setting up first client for clear.";
+    if (!GetClient(0)->SetupSyncForClear()) {
       LOG(FATAL) << "SetupSync() failed.";
       return false;
     }
+
+    DVLOG(1) << "Done Setting up first client for clear";

[skym, 2017/03/07 18:38:22]

Setting should be setting

Also, end with punctuation to be consistent?

[wylieb, 2017/03/07 19:52:23]

Done.

+    ClearServerData(GetClient(0));
+
+    // Sync each of the profiles.
+    for (int i = 1; i < num_clients_; ++i) {
+      DVLOG(1) << "Setting up " << i << " client";
+
+      if (!GetClient(i)->SetupSync()) {
+        LOG(FATAL) << "SetupSync() failed.";
+        return false;
+      }
+    }
+  } else {
+    // Sync each of the profiles.
+    for (int i = 0; i < num_clients_; ++i) {

[skym, 2017/03/07 18:38:22]

This loop and logic seems extremely similar to just a few lines above.

+      if (!GetClient(i)->SetupSync()) {
+        LOG(FATAL) << "SetupSync() failed.";
+        return false;
+      }
+    }
   }
 
   // Because clients may modify sync data as part of startup (for example local
   // session-releated data is rewritten), we need to ensure all startup-based
   // changes have propagated between the clients.
   //
   // Tests that don't use self-notifications can't await quiescense.  They'll
   // have to find their own way of waiting for an initial state if they really
   // need such guarantees.
   if (TestUsesSelfNotifications()) {
@@ skipping 502 matching lines @@
 
 void SyncTest::TriggerSyncForModelTypes(int index,
                                         syncer::ModelTypeSet model_types) {
   GetSyncService(index)->TriggerRefresh(model_types);
 }
 
 void SyncTest::SetPreexistingPreferencesFileContents(
     const std::string& contents) {
   preexisting_preferences_file_contents_ = contents;
 }
+
+void SyncTest::ClearServerData(ProfileSyncServiceHarness* harness) {
+  // start config, at this point out bday is good

[skym, 2017/03/07 18:38:22]

Sorry for all the obnoxious nits, but,
https://google.github.io/styleguide/cppguide.html#Punctuation,_Spelling_and_G...

Also, out should be our, I think.

[wylieb, 2017/03/07 19:52:23]

Done.

+  base::RunLoop run_loop;
+  harness->service()->ClearServerDataForTest(run_loop.QuitClosure());
+  run_loop.Run();
+
+  harness->RestartSyncService();
+}