diff options
Diffstat (limited to 'chrome/browser/content_settings')
4 files changed, 21 insertions, 20 deletions
diff --git a/chrome/browser/content_settings/content_settings_browsertest.cc b/chrome/browser/content_settings/content_settings_browsertest.cc index 38fbc00..3bb6c42 100644 --- a/chrome/browser/content_settings/content_settings_browsertest.cc +++ b/chrome/browser/content_settings/content_settings_browsertest.cc @@ -157,7 +157,7 @@ IN_PROC_BROWSER_TEST_F(ContentSettingsTest, AllowCookiesUsingExceptions) { ASSERT_TRUE(test_server()->Start()); GURL url = test_server()->GetURL("files/setcookie.html"); CookieSettings* settings = - CookieSettings::Factory::GetForProfile(browser()->profile()); + CookieSettings::Factory::GetForProfile(browser()->profile()).get(); settings->SetDefaultCookieSetting(CONTENT_SETTING_BLOCK); ui_test_utils::NavigateToURL(browser(), url); @@ -176,10 +176,10 @@ IN_PROC_BROWSER_TEST_F(ContentSettingsTest, BlockCookiesUsingExceptions) { ASSERT_TRUE(test_server()->Start()); GURL url = test_server()->GetURL("files/setcookie.html"); CookieSettings* settings = - CookieSettings::Factory::GetForProfile(browser()->profile()); - settings->SetCookieSetting( - ContentSettingsPattern::FromURL(url), - ContentSettingsPattern::Wildcard(), CONTENT_SETTING_BLOCK); + CookieSettings::Factory::GetForProfile(browser()->profile()).get(); + settings->SetCookieSetting(ContentSettingsPattern::FromURL(url), + ContentSettingsPattern::Wildcard(), + CONTENT_SETTING_BLOCK); ui_test_utils::NavigateToURL(browser(), url); ASSERT_TRUE(GetCookies(browser()->profile(), url).empty()); @@ -204,7 +204,7 @@ IN_PROC_BROWSER_TEST_F(ContentSettingsTest, GURL url = URLRequestMockHTTPJob::GetMockUrl( base::FilePath(FILE_PATH_LITERAL("setcookie.html"))); CookieSettings* settings = - CookieSettings::Factory::GetForProfile(browser()->profile()); + CookieSettings::Factory::GetForProfile(browser()->profile()).get(); settings->SetDefaultCookieSetting(CONTENT_SETTING_BLOCK); ui_test_utils::NavigateToURL(browser(), url); diff --git a/chrome/browser/content_settings/content_settings_internal_extension_provider.cc b/chrome/browser/content_settings/content_settings_internal_extension_provider.cc index 56dd993..c6527c1 100644 --- a/chrome/browser/content_settings/content_settings_internal_extension_provider.cc +++ b/chrome/browser/content_settings/content_settings_internal_extension_provider.cc @@ -29,8 +29,8 @@ InternalExtensionProvider::InternalExtensionProvider( const ExtensionSet* extensions = extension_service->extensions(); for (ExtensionSet::const_iterator it = extensions->begin(); it != extensions->end(); ++it) { - if (extensions::PluginInfo::HasPlugins(*it)) - SetContentSettingForExtension(*it, CONTENT_SETTING_ALLOW); + if (extensions::PluginInfo::HasPlugins(it->get())) + SetContentSettingForExtension(it->get(), CONTENT_SETTING_ALLOW); } Profile* profile = extension_service->profile(); registrar_->Add(this, chrome::NOTIFICATION_EXTENSION_HOST_CREATED, diff --git a/chrome/browser/content_settings/cookie_settings_unittest.cc b/chrome/browser/content_settings/cookie_settings_unittest.cc index 59d2d55..59f4570 100644 --- a/chrome/browser/content_settings/cookie_settings_unittest.cc +++ b/chrome/browser/content_settings/cookie_settings_unittest.cc @@ -22,17 +22,18 @@ namespace { class CookieSettingsTest : public testing::Test { public: - CookieSettingsTest() : - ui_thread_(BrowserThread::UI, &message_loop_), - cookie_settings_(CookieSettings::Factory::GetForProfile(&profile_)), - kBlockedSite("http://ads.thirdparty.com"), - kAllowedSite("http://good.allays.com"), - kFirstPartySite("http://cool.things.com"), - kBlockedFirstPartySite("http://no.thirdparties.com"), - kExtensionURL("chrome-extension://deadbeef"), - kHttpsSite("https://example.com"), - kAllHttpsSitesPattern(ContentSettingsPattern::FromString("https://*")) { -} + CookieSettingsTest() + : ui_thread_(BrowserThread::UI, &message_loop_), + cookie_settings_(CookieSettings::Factory::GetForProfile(&profile_) + .get()), + kBlockedSite("http://ads.thirdparty.com"), + kAllowedSite("http://good.allays.com"), + kFirstPartySite("http://cool.things.com"), + kBlockedFirstPartySite("http://no.thirdparties.com"), + kExtensionURL("chrome-extension://deadbeef"), + kHttpsSite("https://example.com"), + kAllHttpsSitesPattern(ContentSettingsPattern::FromString("https://*")) { + } protected: base::MessageLoop message_loop_; diff --git a/chrome/browser/content_settings/host_content_settings_map_unittest.cc b/chrome/browser/content_settings/host_content_settings_map_unittest.cc index ed4f55d..78f5a39 100644 --- a/chrome/browser/content_settings/host_content_settings_map_unittest.cc +++ b/chrome/browser/content_settings/host_content_settings_map_unittest.cc @@ -395,7 +395,7 @@ TEST_F(HostContentSettingsMapTest, HostTrimEndingDotCheck) { HostContentSettingsMap* host_content_settings_map = profile.GetHostContentSettingsMap(); CookieSettings* cookie_settings = - CookieSettings::Factory::GetForProfile(&profile); + CookieSettings::Factory::GetForProfile(&profile).get(); ContentSettingsPattern pattern = ContentSettingsPattern::FromString("[*.]example.com"); |