Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3287)

Unified Diff: chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

Issue 11968032: Move 'theme' parsing out of Extension class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed IncognitoAutofillManagerTest unittest Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/autofill/autofill_manager_unittest.cc ('k') | chrome/browser/themes/browser_theme_pack.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
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 7801239054bce48d81659dfffb81b105a08b9051..4653f2eef1db499784ca3bb9b6dd78ac14677edd 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);
« no previous file with comments | « chrome/browser/autofill/autofill_manager_unittest.cc ('k') | chrome/browser/themes/browser_theme_pack.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698