Revert 238348 "Clean up TestProfileSyncService and related tests"

trunk/src/chrome/browser/sync/profile_sync_service_session_unittest.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 <map>
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/guid.h"
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/stl_util.h"
 #include "base/time/time.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/invalidation/invalidation_service_factory.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
-#include "chrome/browser/signin/profile_oauth2_token_service.h"
-#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/abstract_profile_sync_service_test.h"
 #include "chrome/browser/sync/fake_oauth2_token_service.h"
 #include "chrome/browser/sync/glue/device_info.h"
 #include "chrome/browser/sync/glue/session_change_processor.h"
 #include "chrome/browser/sync/glue/session_data_type_controller.h"
 #include "chrome/browser/sync/glue/session_model_associator.h"
 #include "chrome/browser/sync/glue/session_sync_test_helper.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
@@ skipping 45 matching lines @@
 
 namespace {
 
 class FakeProfileSyncService : public TestProfileSyncService {
  public:
   FakeProfileSyncService(
       ProfileSyncComponentsFactory* factory,
       Profile* profile,
       SigninManagerBase* signin,
       ProfileOAuth2TokenService* oauth2_token_service,
-      ProfileSyncService::StartBehavior behavior)
+      ProfileSyncService::StartBehavior behavior,
+      bool synchronous_backend_initialization)
       : TestProfileSyncService(factory,
                                profile,
                                signin,
                                oauth2_token_service,
-                               behavior) {}
+                               behavior,
+                               synchronous_backend_initialization) {}
   virtual ~FakeProfileSyncService() {}
 
   virtual scoped_ptr<DeviceInfo> GetLocalDeviceInfo() const OVERRIDE {
     return scoped_ptr<DeviceInfo>(new DeviceInfo(base::GenerateGUID(),
                                                  "client_name",
                                                  std::string(),
                                                  std::string(),
                                                  sync_pb::SyncEnums::TYPE_WIN));
   }
 };
@@ skipping 86 matching lines @@
     signin->SetAuthenticatedUsername("test_user");
     ProfileOAuth2TokenService* oauth2_token_service =
         ProfileOAuth2TokenServiceFactory::GetForProfile(profile());
     ProfileSyncComponentsFactoryMock* factory =
         new ProfileSyncComponentsFactoryMock();
     sync_service_.reset(new FakeProfileSyncService(
         factory,
         profile(),
         signin,
         oauth2_token_service,
-        ProfileSyncService::AUTO_START));
+        ProfileSyncService::AUTO_START,
+        false));
     sync_service_->set_backend_init_callback(callback);
 
     // Register the session data type.
     SessionDataTypeController *dtc = new SessionDataTypeController(factory,
                                          profile(),
                                          sync_service_.get());
     sync_service_->RegisterDataTypeController(dtc);
 
     model_associator_ =
         new SessionModelAssociator(sync_service_.get(),
@@ skipping 1066 matching lines @@
     tab_node.SetSessionSpecifics(specifics);
   }
 
   error = model_associator_->DisassociateModels();
   ASSERT_FALSE(error.IsSet());
   error = model_associator_->AssociateModels(NULL, NULL);
   ASSERT_FALSE(error.IsSet());
 }
 
 }  // namespace browser_sync