diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-30 21:50:19 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-30 21:50:19 +0000 |
| commit | ac52245b577be6105226d4a4befb9b55fe45ef19 (patch) | |
| tree | b7b7e83db6567f4e7e6824f6697c636dfc1dd7d7 | |
| parent | 681c8e5c3127938253b077aaaa176a23c482fe68 (diff) | |
| download | chromium_src-ac52245b577be6105226d4a4befb9b55fe45ef19.zip chromium_src-ac52245b577be6105226d4a4befb9b55fe45ef19.tar.gz chromium_src-ac52245b577be6105226d4a4befb9b55fe45ef19.tar.bz2 | |
Enable sync by default on all platforms.
BUG=23073
TEST=ran without --enable-sync on OS X, made sure sync UI was still present
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=33318
Review URL: http://codereview.chromium.org/438005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33342 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/cocoa/bug_report_window_controller_unittest.mm | 6 | ||||
| -rw-r--r-- | chrome/browser/sync/profile_sync_service.cc | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/chrome/browser/cocoa/bug_report_window_controller_unittest.mm b/chrome/browser/cocoa/bug_report_window_controller_unittest.mm index 941327f..65b0a87 100644 --- a/chrome/browser/cocoa/bug_report_window_controller_unittest.mm +++ b/chrome/browser/cocoa/bug_report_window_controller_unittest.mm @@ -14,6 +14,12 @@ namespace { class BugReportWindowControllerUnittest : public RenderViewHostTestHarness { + public: + virtual void SetUp() { + RenderViewHostTestHarness::SetUp(); + // This is needed since the new tab page queries the sync service. + profile_->CreateProfileSyncService(); + } }; // See http://crbug.com/29019 for why it's disabled. diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index d380578..ca95b97 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -425,11 +425,9 @@ void ProfileSyncService::SyncEvent(SyncEventCodes code) { } bool ProfileSyncService::IsSyncEnabled() { -#if defined(OS_POSIX) - return CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableSync); -#else + // We have switches::kEnableSync just in case we need to change back to + // sync-disabled-by-default on a platform. return !CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableSync); -#endif } bool ProfileSyncService::ShouldPushChanges() { |