Remove the enable-sync flag from the Chrome command line and enable sync by default.

BUG=none
Test=Sync my bookmarks should be enabled by default.
Review URL: http://codereview.chromium.org/248024

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27472 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 17 insertions, 0 deletions

diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc
index 1eb312d..cb380fc 100644
--- a/chrome/test/testing_profile.cc
+++ b/chrome/test/testing_profile.cc
@@ -8,6 +8,7 @@
 #include "base/string_util.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/history/history_backend.h"
+#include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/common/chrome_constants.h"
 
 #if defined(OS_LINUX) && !defined(TOOLKIT_VIEWS)
@@ -199,3 +200,19 @@ void TestingProfile::BlockUntilHistoryProcessesPendingRequests() {
   history_service_->ScheduleDBTask(new QuittingHistoryDBTask(), &consumer);
   MessageLoop::current()->Run();
 }
+
+void TestingProfile::CreateProfileSyncService() {
+#ifdef CHROME_PERSONALIZATION
+  if (!profile_sync_service_.get()) {
+    profile_sync_service_.reset(new ProfileSyncService(this));
+    profile_sync_service_->Initialize();
+  }
+#endif
+}
+
+ProfileSyncService* TestingProfile::GetProfileSyncService() {
+#ifdef CHROME_PERSONALIZATION
+  return profile_sync_service_.get();
+#endif
+  return NULL;
+}