| Index: chrome/browser/sync/startup_controller.cc
|
| diff --git a/chrome/browser/sync/startup_controller.cc b/chrome/browser/sync/startup_controller.cc
|
| index 05b947a31da42c8d814a3f383a96b3916fefe4a9..ad424a01cb56b284a9e3f1cff53cb885c7e2f649 100644
|
| --- a/chrome/browser/sync/startup_controller.cc
|
| +++ b/chrome/browser/sync/startup_controller.cc
|
| @@ -10,8 +10,8 @@
|
| #include "base/strings/string_number_conversions.h"
|
| #include "chrome/browser/managed_mode/managed_user_signin_manager_wrapper.h"
|
| #include "chrome/browser/signin/profile_oauth2_token_service.h"
|
| -#include "chrome/browser/sync/sync_prefs.h"
|
| #include "chrome/common/chrome_switches.h"
|
| +#include "components/sync_driver/sync_prefs.h"
|
|
|
| namespace browser_sync {
|
|
|
| @@ -37,7 +37,7 @@ enum DeferredInitTrigger {
|
| StartupController::StartupController(
|
| ProfileSyncServiceStartBehavior start_behavior,
|
| const ProfileOAuth2TokenService* token_service,
|
| - const browser_sync::SyncPrefs* sync_prefs,
|
| + const sync_driver::SyncPrefs* sync_prefs,
|
| const ManagedUserSigninManagerWrapper* signin,
|
| base::Closure start_backend)
|
| : received_start_request_(false),
|
| @@ -47,8 +47,8 @@ StartupController::StartupController(
|
| token_service_(token_service),
|
| signin_(signin),
|
| start_backend_(start_backend),
|
| - fallback_timeout_(base::TimeDelta::FromSeconds(
|
| - kDeferredInitFallbackSeconds)),
|
| + fallback_timeout_(
|
| + base::TimeDelta::FromSeconds(kDeferredInitFallbackSeconds)),
|
| weak_factory_(this) {
|
|
|
| if (CommandLine::ForCurrentProcess()->HasSwitch(
|
|
|