sync: final pieces to sync deferred initialization

chrome/browser/sync/profile_sync_service_mock.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 "base/prefs/pref_service.h"
 #include "base/prefs/testing_pref_store.h"
 #include "chrome/browser/managed_mode/managed_user_signin_manager_wrapper.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/profile_sync_service_mock.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/testing_profile.h"
 
 ProfileSyncServiceMock::ProfileSyncServiceMock(Profile* profile)
     : ProfileSyncService(
           NULL,
           profile,
           new ManagedUserSigninManagerWrapper(
               SigninManagerFactory::GetForProfile(profile)),
           ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
-          ProfileSyncService::MANUAL_START) {}
+          browser_sync::MANUAL_START) {}
 
 ProfileSyncServiceMock::~ProfileSyncServiceMock() {
 }
 
 // static
 TestingProfile* ProfileSyncServiceMock::MakeSignedInTestingProfile() {
   TestingProfile* profile = new TestingProfile();
   profile->GetPrefs()->SetString(prefs::kGoogleServicesUsername, "foo");
   return profile;
 }
@@ skipping 10 matching lines @@
   std::vector<browser_sync::DeviceInfo*>* device_vector =
       GetAllSignedInDevicesMock();
   devices.get() = *device_vector;
   return devices.Pass();
 }
 
 scoped_ptr<browser_sync::DeviceInfo>
     ProfileSyncServiceMock::GetLocalDeviceInfo() const {
   return scoped_ptr<browser_sync::DeviceInfo>(GetLocalDeviceInfoMock()).Pass();
 }