diff options
author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-15 01:19:11 +0000 |
---|---|---|
committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-15 01:19:11 +0000 |
commit | 48352c11fe849f7f786c43bdfe293dc2c58d12c5 (patch) | |
tree | 57708d7e211d7cbcf2b81b1395740f5859a62aa1 /chrome/test/live_sync | |
parent | 20cc723d102acb16b61789714bbf443ba3d7d1f5 (diff) | |
download | chromium_src-48352c11fe849f7f786c43bdfe293dc2c58d12c5.zip chromium_src-48352c11fe849f7f786c43bdfe293dc2c58d12c5.tar.gz chromium_src-48352c11fe849f7f786c43bdfe293dc2c58d12c5.tar.bz2 |
Some personalization cleanup:
- Removes ProfilePersonalization (which is why the CL appears huge)
- Makes Profile do the work ProfilePersonalization did for creating PSS
- cloudy:stats > about:sync
- Removes the cloudy:// scheme and uses chrome:// for resources.
(Note SyncResourcesSource is a straight copy of CloudyResourceSource).
- Moves prefs and switches to pref_names and chrome_switches.
BUG=none
TEST=ProfileSyncServiceTest, LiveBookmarkSyncTests, SyncSetupWizardTest
Review URL: http://codereview.chromium.org/164544
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23505 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/live_sync')
-rw-r--r-- | chrome/test/live_sync/live_bookmarks_sync_test.cc | 5 | ||||
-rw-r--r-- | chrome/test/live_sync/live_bookmarks_sync_test.h | 7 | ||||
-rw-r--r-- | chrome/test/live_sync/profile_sync_service_test_harness.cc | 4 |
3 files changed, 13 insertions, 3 deletions
diff --git a/chrome/test/live_sync/live_bookmarks_sync_test.cc b/chrome/test/live_sync/live_bookmarks_sync_test.cc index 43c1db0..3737cc3 100644 --- a/chrome/test/live_sync/live_bookmarks_sync_test.cc +++ b/chrome/test/live_sync/live_bookmarks_sync_test.cc @@ -15,6 +15,11 @@ #include "chrome/browser/profile_manager.h" #include "chrome/test/ui_test_utils.h" +namespace switches { +const wchar_t kSyncUserForTest[] = L"sync-user-for-test"; +const wchar_t kSyncPasswordForTest[] = L"sync-password-for-test"; +} + // BookmarkLoadObserver is used when blocking until the BookmarkModel // finishes loading. As soon as the BookmarkModel finishes loading the message // loop is quit. diff --git a/chrome/test/live_sync/live_bookmarks_sync_test.h b/chrome/test/live_sync/live_bookmarks_sync_test.h index 0c603802..368eeb1 100644 --- a/chrome/test/live_sync/live_bookmarks_sync_test.h +++ b/chrome/test/live_sync/live_bookmarks_sync_test.h @@ -20,6 +20,11 @@ class BookmarkModel; class BookmarkNode; class Profile; +namespace switches { +extern const wchar_t kSyncUserForTest[]; +extern const wchar_t kSyncPasswordForTest[]; +} + // TODO(timsteele): This should be moved out of personalization_unit_tests into // its own project that doesn't get run by default on the standard buildbot // without a valid sync server set up. @@ -59,7 +64,7 @@ class LiveBookmarksSyncTest : public InProcessBrowserTest { protected: std::string username_; std::string password_; - + private: DISALLOW_COPY_AND_ASSIGN(LiveBookmarksSyncTest); }; diff --git a/chrome/test/live_sync/profile_sync_service_test_harness.cc b/chrome/test/live_sync/profile_sync_service_test_harness.cc index 57ceeb6..debb782 100644 --- a/chrome/test/live_sync/profile_sync_service_test_harness.cc +++ b/chrome/test/live_sync/profile_sync_service_test_harness.cc @@ -116,8 +116,8 @@ ProfileSyncServiceTestHarness::ProfileSyncServiceTestHarness( } bool ProfileSyncServiceTestHarness::SetupSync() { - service_ = profile_->GetProfilePersonalization()->sync_service(); - profile_->GetPrefs()->SetBoolean(prefs::kSyncHasSetupCompleted, true); + service_ = profile_->GetProfileSyncService(); + service_->SetSyncSetupCompleted(); service_->EnableForUser(); // Needed to avoid showing the login dialog. Well aware this is egregious. |