diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-02 00:55:01 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-02 00:55:01 +0000 |
| commit | 32f076f65de1d1e40b462a6a704b27b34a9725ca (patch) | |
| tree | d7e3481c328f6c652574660d4fba4d51bb990400 /chrome/test | |
| parent | def7569aa65431ec13b61ef43803ddcf0dabcf44 (diff) | |
| download | chromium_src-32f076f65de1d1e40b462a6a704b27b34a9725ca.zip chromium_src-32f076f65de1d1e40b462a6a704b27b34a9725ca.tar.gz chromium_src-32f076f65de1d1e40b462a6a704b27b34a9725ca.tar.bz2 | |
Migrate old cookie setting to new system.
Also, do a better job of making sure we don't write useless default values to disk, and we force the in-memory copy of the default prefs to never say "DEFAULT" even if a caller provides that to SetDefaultContentSetting().
BUG=32719
TEST=unittests
Review URL: http://codereview.chromium.org/562003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37775 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/live_sync/profile_sync_service_test_harness.cc | 4 |
1 files changed, 1 insertions, 3 deletions
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 74b8928..4bee1ce 100644 --- a/chrome/test/live_sync/profile_sync_service_test_harness.cc +++ b/chrome/test/live_sync/profile_sync_service_test_harness.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -114,8 +114,6 @@ ProfileSyncServiceTestHarness::ProfileSyncServiceTestHarness( // Ensure the profile has enough prefs registered for use by sync. if (!p->GetPrefs()->FindPreference(prefs::kAcceptLanguages)) TabContents::RegisterUserPrefs(p->GetPrefs()); - if (!p->GetPrefs()->FindPreference(prefs::kCookieBehavior)) - Browser::RegisterUserPrefs(p->GetPrefs()); } bool ProfileSyncServiceTestHarness::SetupSync() { |