[Sync] Refactored ProfileSyncService and remove its backend() function

chrome/browser/sync/test_profile_sync_service.h

Index: chrome/browser/sync/test_profile_sync_service.h
diff --git a/chrome/browser/sync/test_profile_sync_service.h b/chrome/browser/sync/test_profile_sync_service.h
index b1d6ef4627b90533f20f61ffe5193521dffe9446..9d99cd9ea868395baaecd11116993dbd34bbc22e 100644
--- a/chrome/browser/sync/test_profile_sync_service.h
+++ b/chrome/browser/sync/test_profile_sync_service.h
@@ -8,41 +8,16 @@
 
 #include <string>
 
-#include "base/message_loop.h"
-#include "chrome/browser/sync/engine/syncapi.h"
-#include "chrome/browser/sync/profile_sync_factory.h"
-#include "chrome/browser/sync/profile_sync_service.h"
-#include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/glue/data_type_manager_impl.h"
-#include "chrome/browser/sync/glue/sync_backend_host.h"
-#include "chrome/browser/sync/sessions/session_state.h"
-#include "chrome/browser/sync/syncable/directory_manager.h"
-#include "chrome/browser/sync/syncable/syncable.h"
+#include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/test/profile_mock.h"
-#include "chrome/test/sync/test_http_bridge_factory.h"
 #include "chrome/test/sync/engine/test_id_factory.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 class Profile;
+class Task;
 class TestProfileSyncService;
 
-using browser_sync::ModelSafeRoutingInfo;
-using browser_sync::sessions::ErrorCounters;
-using browser_sync::sessions::SyncerStatus;
-using browser_sync::sessions::SyncSessionSnapshot;
-using sync_api::UserShare;
-using syncable::DirectoryManager;
-using syncable::ModelType;
-using syncable::ScopedDirLookup;
-
-ACTION_P(CallOnPaused, core) {
-  core->OnPaused();
-};
-
-ACTION_P(CallOnResumed, core) {
-  core->OnResumed();
-}
-
 ACTION(ReturnNewDataTypeManager) {
   return new browser_sync::DataTypeManagerImpl(arg0, arg1);
 }
@@ -55,17 +30,10 @@ namespace browser_sync {
 // download.
 class SyncBackendHostForProfileSyncTest : public SyncBackendHost {
  public:
-  // |initial_condition_setup_task| can be used to populate nodes before the
-  //     OnBackendInitialized callback fires.
-  // |set_initial_sync_ended_on_init| determines whether we pretend that a full
-  //     initial download has occurred and set bits for enabled data types.  If
-  //     this is false, configuring data types will require a syncer nudge.
   // |synchronous_init| causes initialization to block until the syncapi has
   //     completed setting itself up and called us back.
   SyncBackendHostForProfileSyncTest(
-      TestProfileSyncService* service,
       Profile* profile,
-      Task* initial_condition_setup_task,
       int num_expected_resumes,
       int num_expected_pauses,
       bool set_initial_sync_ended_on_init,
@@ -75,141 +43,60 @@ class SyncBackendHostForProfileSyncTest : public SyncBackendHost {
   MOCK_METHOD0(RequestResume, bool());
   MOCK_METHOD0(RequestNudge, void());
 
-  void SetInitialSyncEndedForEnabledTypes() {
-    UserShare* user_share = core_->syncapi()->GetUserShare();
-    DirectoryManager* dir_manager = user_share->dir_manager.get();
-
-    ScopedDirLookup dir(dir_manager, user_share->name);
-    if (!dir.good())
-      FAIL();
-
-    ModelSafeRoutingInfo enabled_types;
-    GetModelSafeRoutingInfo(&enabled_types);
-    for (ModelSafeRoutingInfo::const_iterator i = enabled_types.begin();
-         i != enabled_types.end(); ++i) {
-      dir->set_initial_sync_ended_for_type(i->first, true);
-    }
-  }
-
   virtual void ConfigureDataTypes(
       const DataTypeController::TypeMap& data_type_controllers,
       const syncable::ModelTypeSet& types,
-      CancelableTask* ready_task) {
-    SetAutofillMigrationState(syncable::MIGRATED);
-    SyncBackendHost::ConfigureDataTypes(
-        data_type_controllers, types, ready_task);
-  }
+      CancelableTask* ready_task);
 
   // Called when a nudge comes in.
-  void SimulateSyncCycleCompletedInitialSyncEnded() {
-    syncable::ModelTypeBitSet sync_ended;
-    ModelSafeRoutingInfo enabled_types;
-    GetModelSafeRoutingInfo(&enabled_types);
-    std::string download_progress_markers[syncable::MODEL_TYPE_COUNT];
-    for (ModelSafeRoutingInfo::const_iterator i = enabled_types.begin();
-         i != enabled_types.end(); ++i) {
-      sync_ended.set(i->first);
-    }
-    core_->HandleSyncCycleCompletedOnFrontendLoop(new SyncSessionSnapshot(
-        SyncerStatus(), ErrorCounters(), 0, false,
-        sync_ended, download_progress_markers, false, false, 0, 0, false));
-  }
-
-  virtual void HandleInitializationCompletedOnFrontendLoop();
+  void SimulateSyncCycleCompletedInitialSyncEnded();
 
   virtual sync_api::HttpPostProviderFactory* MakeHttpBridgeFactory(
-      URLRequestContextGetter* getter) {
-    return new browser_sync::TestHttpBridgeFactory;
-  }
-
-  virtual void InitCore(const Core::DoInitializeOptions& options) {
-    std::wstring user = L"testuser";
-    core_loop()->PostTask(FROM_HERE,
-        NewRunnableMethod(core_.get(),
-        &SyncBackendHost::Core::DoInitializeForTest,
-        user,
-        options.http_bridge_factory,
-        options.delete_sync_data_folder));
-
-    // TODO(akalin): Figure out a better way to do this.
-    if (synchronous_init_) {
-      // The SyncBackend posts a task to the current loop when
-      // initialization completes.
-      MessageLoop::current()->Run();
-    }
-  }
-
-  static void SetDefaultExpectationsForWorkerCreation(ProfileMock* profile) {
-    EXPECT_CALL(*profile, GetPasswordStore(testing::_)).
-        WillOnce(testing::Return((PasswordStore*)NULL));
-  }
-
-  static void SetHistoryServiceExpectations(ProfileMock* profile) {
-    EXPECT_CALL(*profile, GetHistoryService(testing::_)).
-        WillOnce(testing::Return((HistoryService*)NULL));
-  }
+      URLRequestContextGetter* getter);
+
+  virtual void InitCore(const Core::DoInitializeOptions& options);
+
+  static void SetDefaultExpectationsForWorkerCreation(ProfileMock* profile);
+
+  static void SetHistoryServiceExpectations(ProfileMock* profile);
 
  private:
-  Task* initial_condition_setup_task_;
-  bool set_initial_sync_ended_on_init_;
   bool synchronous_init_;
-  TestProfileSyncService* test_service_;
 };
 
 }  // namespace browser_sync
 
 class TestProfileSyncService : public ProfileSyncService {
  public:
+  // |initial_condition_setup_task| can be used to populate nodes before the
+  //     OnBackendInitialized callback fires.

[tim (not reviewing), 2011/01/21 18:17:00]

nit - indent

[akalin, 2011/01/21 21:21:09]

Done.

   TestProfileSyncService(ProfileSyncFactory* factory,
                          Profile* profile,
                          const std::string& test_user,
                          bool synchronous_backend_initialization,
-                         Task* initial_condition_setup_task)
-      : ProfileSyncService(factory, profile, test_user),
-        synchronous_backend_initialization_(
-            synchronous_backend_initialization),
-        synchronous_sync_configuration_(false),
-        num_expected_resumes_(1),
-        num_expected_pauses_(1),
-        initial_condition_setup_task_(initial_condition_setup_task),
-        set_initial_sync_ended_on_init_(true) {
-    RegisterPreferences();
-    SetSyncSetupCompleted();
-  }
-  virtual ~TestProfileSyncService() { }
-
-  virtual void OnBackendInitialized() {
-    ProfileSyncService::OnBackendInitialized();
-    // TODO(akalin): Figure out a better way to do this.
-    if (synchronous_backend_initialization_) {
-      MessageLoop::current()->Quit();
-    }
-  }
+                         Task* initial_condition_setup_task);
+
+  virtual ~TestProfileSyncService();
+
+  void SetInitialSyncEndedForEnabledTypes();
+
+  virtual void OnBackendInitialized();
 
   virtual void Observe(NotificationType type,
-                      const NotificationSource& source,
-                      const NotificationDetails& details) {
-    ProfileSyncService::Observe(type, source, details);
-    if (type == NotificationType::SYNC_CONFIGURE_DONE &&
-        !synchronous_sync_configuration_) {
-      MessageLoop::current()->Quit();
-    }
-  }
-
-  void set_num_expected_resumes(int times) {
-    num_expected_resumes_ = times;
-  }
-  void set_num_expected_pauses(int num) {
-    num_expected_pauses_ = num;
-  }
-  void dont_set_initial_sync_ended_on_init() {
-    set_initial_sync_ended_on_init_ = false;
-  }
-  void set_synchronous_sync_configuration() {
-    synchronous_sync_configuration_ = true;
-  }
-
-  browser_sync::TestIdFactory* id_factory() { return &id_factory_; }
+                       const NotificationSource& source,
+                       const NotificationDetails& details);
+
+  void set_num_expected_resumes(int times);
+  void set_num_expected_pauses(int num);
+
+  // If this is called, configuring data types will require a syncer
+  // nudge.
+  void dont_set_initial_sync_ended_on_init();
+  void set_synchronous_sync_configuration();
+
+  browser_sync::TestIdFactory* id_factory();
+
+  browser_sync::SyncBackendHostForProfileSyncTest* GetTestBackend();
 
  protected:
   virtual void CreateBackend();
@@ -217,9 +104,9 @@ class TestProfileSyncService : public ProfileSyncService {
  private:
   // When testing under ChromiumOS, this method must not return an empty
   // value value in order for the profile sync service to start.
-  virtual std::string GetLsidForAuthBootstraping() {
-    return "foo";
-  }
+  virtual std::string GetLsidForAuthBootstraping();
+
+  browser_sync::TestIdFactory id_factory_;
 
   bool synchronous_backend_initialization_;
 
@@ -230,9 +117,8 @@ class TestProfileSyncService : public ProfileSyncService {
   int num_expected_resumes_;
   int num_expected_pauses_;
 
-  scoped_ptr<Task> initial_condition_setup_task_;
+  Task* initial_condition_setup_task_;
   bool set_initial_sync_ended_on_init_;
-  browser_sync::TestIdFactory id_factory_;
 };