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, 8 insertions, 3 deletions

diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h
index b894d7b..f766f469 100644
--- a/chrome/test/testing_profile.h
+++ b/chrome/test/testing_profile.h
@@ -241,9 +241,9 @@ class TestingProfile : public Profile {
   // history service processes all pending requests.
   void BlockUntilHistoryProcessesPendingRequests();
 
-  virtual ProfileSyncService* GetProfileSyncService() {
-    return NULL;
-  }
+  // Creates and initializes a profile sync service if the tests require one.
+  void CreateProfileSyncService();
+  virtual ProfileSyncService* GetProfileSyncService();
 
  protected:
   // The path of the profile; the various database and other files are relative
@@ -263,6 +263,11 @@ class TestingProfile : public Profile {
   // The BookmarkModel. Only created if CreateBookmarkModel is invoked.
   scoped_ptr<BookmarkModel> bookmark_bar_model_;
 
+  // The ProfileSyncService.  Created by CreateProfileSyncService.
+#ifdef CHROME_PERSONALIZATION
+  scoped_ptr<ProfileSyncService> profile_sync_service_;
+#endif
+
   // The TemplateURLFetcher. Only created if CreateTemplateURLModel is invoked.
   scoped_ptr<TemplateURLModel> template_url_model_;