diff options
| author | MHX348@motorola.com <MHX348@motorola.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-12 02:23:12 +0000 |
|---|---|---|
| committer | MHX348@motorola.com <MHX348@motorola.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-12 02:23:12 +0000 |
| commit | a0cc9a53f5d5422de0b3c3fc078f02c532f7dd79 (patch) | |
| tree | a1a0b094178a0ee012bdbb4e84f57463c467f597 /chrome/browser/content_settings | |
| parent | b5ed99283501f94fb2c2837761b41828af0e40d5 (diff) | |
| download | chromium_src-a0cc9a53f5d5422de0b3c3fc078f02c532f7dd79.zip chromium_src-a0cc9a53f5d5422de0b3c3fc078f02c532f7dd79.tar.gz chromium_src-a0cc9a53f5d5422de0b3c3fc078f02c532f7dd79.tar.bz2 | |
Move 'theme' parsing out of Extension class
BUG=159265
Review URL: https://chromiumcodereview.appspot.com/11968032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181826 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/content_settings')
| -rw-r--r-- | chrome/browser/content_settings/content_settings_pref_provider_unittest.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc index 7801239..4653f2e 100644 --- a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc +++ b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc @@ -149,12 +149,16 @@ TEST_F(PrefProviderTest, Incognito) { Profile::RegisterUserPrefs(otr_registry); chrome::RegisterUserPrefs(otr_prefs, otr_registry); - TestingProfile profile; - TestingProfile* otr_profile = new TestingProfile; - profile.SetOffTheRecordProfile(otr_profile); - profile.SetPrefService(regular_prefs); + TestingProfile::Builder profile_builder; + profile_builder.SetPrefService(make_scoped_ptr(regular_prefs)); + scoped_ptr<TestingProfile> profile = profile_builder.Build(); + + TestingProfile::Builder otr_profile_builder; + otr_profile_builder.SetPrefService(make_scoped_ptr(otr_prefs)); + TestingProfile* otr_profile = otr_profile_builder.Build().release(); + otr_profile->set_incognito(true); - otr_profile->SetPrefService(otr_prefs); + profile->SetOffTheRecordProfile(otr_profile); PrefProvider pref_content_settings_provider(regular_prefs, false); PrefProvider pref_content_settings_provider_incognito(otr_prefs, true); |