diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-21 22:39:09 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-21 22:39:09 +0000 |
| commit | 4f5732a4da9058df1dd5c65f48d79414ce47fb76 (patch) | |
| tree | 102834408898db9165d4396a63914d463f868fde | |
| parent | ed821e44342b66f95c83b80d0b6a2d093ca20958 (diff) | |
| download | chromium_src-4f5732a4da9058df1dd5c65f48d79414ce47fb76.zip chromium_src-4f5732a4da9058df1dd5c65f48d79414ce47fb76.tar.gz chromium_src-4f5732a4da9058df1dd5c65f48d79414ce47fb76.tar.bz2 | |
sync: make default passwords sync pref value false
BUG=56417
TEST=start syncing in debug build, don't crash.
Review URL: http://codereview.chromium.org/3466007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60116 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/sync/profile_sync_service.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/profile_sync_service.h | 1 | ||||
| -rw-r--r-- | chrome/browser/sync/profile_sync_service_password_unittest.cc | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index e781f8d..825f5d1 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -297,7 +297,7 @@ void ProfileSyncService::RegisterPreferences() { #endif pref_service->RegisterBooleanPref(prefs::kSyncBookmarks, true); - pref_service->RegisterBooleanPref(prefs::kSyncPasswords, enable_by_default); + pref_service->RegisterBooleanPref(prefs::kSyncPasswords, false); pref_service->RegisterBooleanPref(prefs::kSyncPreferences, enable_by_default); pref_service->RegisterBooleanPref(prefs::kSyncAutofill, enable_by_default); pref_service->RegisterBooleanPref(prefs::kSyncThemes, enable_by_default); diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h index 63c04b8..8ff579b 100644 --- a/chrome/browser/sync/profile_sync_service.h +++ b/chrome/browser/sync/profile_sync_service.h @@ -372,6 +372,7 @@ class ProfileSyncService : public browser_sync::SyncFrontend, private: friend class ProfileSyncServiceTest; + friend class ProfileSyncServicePasswordTest; friend class ProfileSyncServicePreferenceTest; friend class ProfileSyncServiceSessionTest; friend class ProfileSyncServiceTestHarness; diff --git a/chrome/browser/sync/profile_sync_service_password_unittest.cc b/chrome/browser/sync/profile_sync_service_password_unittest.cc index ea53bf7..d0598c5 100644 --- a/chrome/browser/sync/profile_sync_service_password_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_password_unittest.cc @@ -28,6 +28,7 @@ #include "chrome/common/notification_observer_mock.h" #include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" +#include "chrome/common/pref_names.h" #include "chrome/test/sync/engine/test_id_factory.h" #include "chrome/test/profile_mock.h" #include "testing/gmock/include/gmock/gmock.h" @@ -142,6 +143,8 @@ class ProfileSyncServicePasswordTest : public AbstractProfileSyncServiceTest { if (!service_.get()) { service_.reset(new TestProfileSyncService(&factory_, &profile_, "test_user", false, root_task)); + service_->RegisterPreferences(); + profile_.GetPrefs()->SetBoolean(prefs::kSyncPasswords, true); service_->set_num_expected_resumes(num_resume_expectations); service_->set_num_expected_pauses(num_pause_expectations); PasswordDataTypeController* data_type_controller = |