| Index: chrome/browser/profile.cc
|
| ===================================================================
|
| --- chrome/browser/profile.cc (revision 30247)
|
| +++ chrome/browser/profile.cc (working copy)
|
| @@ -727,9 +727,7 @@
|
| prefs->RemovePrefObserver(prefs::kEnableSpellCheck, this);
|
| prefs->RemovePrefObserver(prefs::kEnableAutoSpellCorrect, this);
|
|
|
| -#if defined(BROWSER_SYNC)
|
| sync_service_.reset();
|
| -#endif
|
|
|
| // Both HistoryService and WebDataService maintain threads for background
|
| // processing. Its possible each thread still has tasks on it that have
|
| @@ -1355,7 +1353,7 @@
|
| }
|
|
|
| ProfileSyncService* ProfileImpl::GetProfileSyncService() {
|
| -#if defined(BROWSER_SYNC) && !defined(OS_POSIX)
|
| +#if !defined(OS_POSIX)
|
| if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableSync)) {
|
| if (!sync_service_.get())
|
| InitSyncService();
|
| @@ -1366,8 +1364,6 @@
|
| }
|
|
|
| void ProfileImpl::InitSyncService() {
|
| -#if defined(BROWSER_SYNC)
|
| sync_service_.reset(new ProfileSyncService(this));
|
| sync_service_->Initialize();
|
| -#endif
|
| }
|
|
|