Revert "[Third time landing] Python implementation of sync server, for testing."

chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc

 // Copyright (c) 2006-2009 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 <stdlib.h>
 #include <string>
 
 #include "base/file_path.h"
 #include "base/rand_util.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
@@ skipping 32 matching lines @@
         profile2_.get(), username_, password_));
     if (ShouldSetupSyncWithRace()) {
       return client1_->SetupSync() && client2_->SetupSync();
     } else {
       bool result_client1 = client1_->SetupSync();
       client1()->AwaitSyncCycleCompletion("Initial setup");
       return result_client1 && client2_->SetupSync();
     }
   }
 
+  // Overwrites ShouldDeleteProfile, so profile doesn't get deleted.
+  virtual bool ShouldDeleteProfile() {
+    return false;
+  }
+
   // Overload this method in inherited class and return false to avoid
   // race condition (two clients trying to sync/commit at the same time).
   // Race condition may lead to duplicate bookmarks if there is existing
   // bookmark model on both clients.
   virtual bool ShouldSetupSyncWithRace() {
     return true;
   }
 
   // Overload this method in your class and return true to pre-populate
   // bookmark files for client2 also.
@@ skipping 19 matching lines @@
     FilePath sync_data_source;
     PathService::Get(base::DIR_SOURCE_ROOT, &sync_data_source);
     sync_data_source = sync_data_source.Append(FILE_PATH_LITERAL("chrome"));
     sync_data_source = sync_data_source.Append(
         FILE_PATH_LITERAL("personalization"));
     sync_data_source = sync_data_source.Append(FILE_PATH_LITERAL("test"));
     sync_data_source = sync_data_source.Append(
         FILE_PATH_LITERAL("live_sync_data"));
     FilePath source_file = sync_data_source.Append(
         bookmarks_file_name);
-    ASSERT_TRUE(file_util::PathExists(source_file))
-        << "Could not locate test data file: " << source_file.value();
+    ASSERT_TRUE(file_util::PathExists(source_file));
     // Now copy pre-generated bookmark file to default profile.
     ASSERT_TRUE(file_util::CopyFile(source_file,
         dest_user_data_dir_default.Append(FILE_PATH_LITERAL("bookmarks"))));
     // Now copy pre-generated bookmark file to verifier profile.
     ASSERT_TRUE(file_util::CopyFile(source_file,
         dest_user_data_dir_verifier.Append(FILE_PATH_LITERAL("bookmarks"))));
 
     // Let's pre-populate bookmarks file for client2 also if we need to.
     if (ShouldCopyBookmarksToClient2()) {
       // Let's create verifier profile directory.
@@ skipping 36 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(TwoClientLiveBookmarksSyncTest);
 };
 
 class LiveSyncTestPrePopulatedHistory1K
     : public TwoClientLiveBookmarksSyncTest {
  public:
   LiveSyncTestPrePopulatedHistory1K() {}
   virtual ~LiveSyncTestPrePopulatedHistory1K() {}
 
-  // This is used to pre-populate history data (1K URL Visit) to Client1
-  // and Verifier Client. Invoked by InProcBrowserTest::SetUp before
-  // the browser is started.
-  virtual void SetUpUserDataDirectory() {
+  // This is used to pre-populate history data (1K URL Visit)to Client1
+  // and Verifier Client.
+  void PrePopulateHistory1K() {
     // Let's copy history files to default profile.
     FilePath dest_user_data_dir;
     PathService::Get(chrome::DIR_USER_DATA, &dest_user_data_dir);
     dest_user_data_dir = dest_user_data_dir.Append(
         FILE_PATH_LITERAL("Default"));
     file_util::CreateDirectory(dest_user_data_dir);
     FilePath sync_data_source;
     PathService::Get(base::DIR_SOURCE_ROOT, &sync_data_source);
     sync_data_source = sync_data_source.Append(FILE_PATH_LITERAL("chrome"));
     sync_data_source = sync_data_source.Append(
         FILE_PATH_LITERAL("personalization"));
     sync_data_source = sync_data_source.Append(FILE_PATH_LITERAL("test"));
     sync_data_source = sync_data_source.Append(
         FILE_PATH_LITERAL("live_sync_data"));
     sync_data_source = sync_data_source.Append(
         FILE_PATH_LITERAL("1K_url_visit_history"));
     sync_data_source = sync_data_source.Append(FILE_PATH_LITERAL("Default"));
     ASSERT_TRUE(file_util::PathExists(sync_data_source));
     file_util::FileEnumerator sync_data(
         sync_data_source, false, file_util::FileEnumerator::FILES);
     FilePath source_file = sync_data.Next();
     while (!source_file.empty()) {
       FilePath dest_file = dest_user_data_dir.Append(source_file.BaseName());
       ASSERT_TRUE(file_util::CopyFile(source_file, dest_file));
       source_file = sync_data.Next();
     }
   }
 
+  virtual void SetUp() {
+    PrePopulateHistory1K();
+    LiveSyncTest::SetUp();
+  }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(LiveSyncTestPrePopulatedHistory1K);
 };
 
 class LiveSyncTestBasicHierarchy50BM
     : public TwoClientLiveBookmarksSyncTest {
  public:
   LiveSyncTestBasicHierarchy50BM() {}
   virtual ~LiveSyncTestBasicHierarchy50BM() {}
 
-  // Invoked by InProcBrowserTest::SetUp before the browser is started.
-  virtual void SetUpUserDataDirectory() {
+  virtual void SetUp() {
     FilePath file_name(FILE_PATH_LITERAL("bookmarks_50BM5F3L"));
     PrePopulateBookmarksHierarchy(file_name);
+    LiveSyncTest::SetUp();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(LiveSyncTestBasicHierarchy50BM);
 };
 
 class LiveSyncTestBasicHierarchy50BMBothClients
     : public LiveSyncTestBasicHierarchy50BM {
  public:
   LiveSyncTestBasicHierarchy50BMBothClients() {}
@@ skipping 12 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(LiveSyncTestBasicHierarchy50BMBothClients);
 };
 
 class LiveSyncTestComplexHierarchy800BM
     : public TwoClientLiveBookmarksSyncTest {
  public:
   LiveSyncTestComplexHierarchy800BM() {}
   virtual ~LiveSyncTestComplexHierarchy800BM() {}
-
-  // Invoked by InProcBrowserTest::SetUp before the browser is started.
-  virtual void SetUpUserDataDirectory() {
+  virtual void SetUp() {
     FilePath file_name(FILE_PATH_LITERAL("bookmarks_800BM32F8L"));
-    PrePopulateBookmarksHierarchy(file_name);
+    TwoClientLiveBookmarksSyncTest::PrePopulateBookmarksHierarchy(file_name);
+    LiveSyncTest::SetUp();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(LiveSyncTestComplexHierarchy800BM);
 };
 
 class LiveSyncTestHugeHierarchy5500BM
     : public TwoClientLiveBookmarksSyncTest {
  public:
   LiveSyncTestHugeHierarchy5500BM() {}
   virtual ~LiveSyncTestHugeHierarchy5500BM() {}
-
-  // Invoked by InProcBrowserTest::SetUp before the browser is started.
-  virtual void SetUpUserDataDirectory() {
+  virtual void SetUp() {
     FilePath file_name(FILE_PATH_LITERAL("bookmarks_5500BM125F25L"));
-    PrePopulateBookmarksHierarchy(file_name);
+    TwoClientLiveBookmarksSyncTest::PrePopulateBookmarksHierarchy(file_name);
+    LiveSyncTest::SetUp();
   }
   virtual bool ShouldSetupSyncWithRace() {
     return false;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(LiveSyncTestHugeHierarchy5500BM);
 };
 
 class LiveSyncTestDefaultIEFavorites
     : public TwoClientLiveBookmarksSyncTest {
  public:
   LiveSyncTestDefaultIEFavorites() {}
   virtual ~LiveSyncTestDefaultIEFavorites() {}
 
-  // Invoked by InProcBrowserTest::SetUp before the browser is started.
-  virtual void SetUpUserDataDirectory() {
+  virtual void SetUp() {
     const FilePath file_name(
         FILE_PATH_LITERAL("bookmarks_default_IE_favorites"));
     TwoClientLiveBookmarksSyncTest::PrePopulateBookmarksHierarchy(file_name);
+    LiveSyncTest::SetUp();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(LiveSyncTestDefaultIEFavorites);
 };
 
 
 
 // Test case Naming Convention:
 // SC/MC - SingleClient / MultiClient.
@@ skipping 2236 matching lines @@
   // Wait for changes to propagate.
   ASSERT_TRUE(client2()->AwaitMutualSyncCycleCompletion(client1()));
   // Let's make sure there aren't any duplicates after sync.
   BookmarkModelVerifier::VerifyNoDuplicates(model_one);
   // Let's compare and make sure both bookmark models are same after sync.
   BookmarkModelVerifier::ExpectModelsMatchIncludingFavicon(
       model_one, model_two, false);
 
   Cleanup();
 }