[Sync] Tidy up SyncBackendHost interface.

chrome/browser/sync/test_profile_sync_service.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_BROWSER_SYNC_TEST_PROFILE_SYNC_SERVICE_H_
 #define CHROME_BROWSER_SYNC_TEST_PROFILE_SYNC_SERVICE_H_
 #pragma once
 
 #include <string>
 
@@ skipping 47 matching lines @@
   // |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,
-      const FilePath& profile_path,
-      const DataTypeController::TypeMap& data_type_controllers,
       Task* initial_condition_setup_task,
       int num_expected_resumes,
       int num_expected_pauses,
       bool set_initial_sync_ended_on_init,
       bool synchronous_init);
 
   MOCK_METHOD0(RequestPause, bool());
   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 syncable::ModelTypeSet& types,
+  virtual void ConfigureDataTypes(
+      const DataTypeController::TypeMap& data_type_controllers,
+      const syncable::ModelTypeSet& types,
       CancelableTask* ready_task) {
     SetAutofillMigrationState(syncable::MIGRATED);
-    SyncBackendHost::ConfigureDataTypes(types, ready_task);
+    SyncBackendHost::ConfigureDataTypes(
+        data_type_controllers, types, 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) {
@@ skipping 47 matching lines @@
 
 }  // namespace browser_sync
 
 class TestProfileSyncService : public ProfileSyncService {
  public:
   TestProfileSyncService(ProfileSyncFactory* factory,
                          Profile* profile,
                          const std::string& test_user,
                          bool synchronous_backend_initialization,
                          Task* initial_condition_setup_task)
-      : ProfileSyncService(factory, profile,
-                           !test_user.empty() ?
-                           test_user : ""),
+      : 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 CreateBackend() {
-    backend_.reset(new browser_sync::SyncBackendHostForProfileSyncTest(
-        this, profile(),
-        profile()->GetPath(), data_type_controllers(),
-        initial_condition_setup_task_.release(),
-        num_expected_resumes_, num_expected_pauses_,
-        set_initial_sync_ended_on_init_,
-        synchronous_backend_initialization_));
-  }
-
   virtual void OnBackendInitialized() {
     ProfileSyncService::OnBackendInitialized();
     // TODO(akalin): Figure out a better way to do this.
     if (synchronous_backend_initialization_) {
       MessageLoop::current()->Quit();
     }
   }
 
   virtual void Observe(NotificationType type,
                       const NotificationSource& source,
@@ skipping 13 matching lines @@
   }
   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_; }
 
+ protected:
+  virtual void CreateBackend();
+
  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";
   }
 
   bool synchronous_backend_initialization_;
 
   // Set to true when a mock data type manager is being used and the configure
   // step is performed synchronously.
   bool synchronous_sync_configuration_;
   bool set_expect_resume_expectations_;
   int num_expected_resumes_;
   int num_expected_pauses_;
 
   scoped_ptr<Task> initial_condition_setup_task_;
   bool set_initial_sync_ended_on_init_;
   browser_sync::TestIdFactory id_factory_;
 };
 
 
 
 #endif  // CHROME_BROWSER_SYNC_TEST_PROFILE_SYNC_SERVICE_H_