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

Unified Diff: chrome/browser/extensions/webstore_inline_installer_browsertest.cc

Issue 1312453005: Removed Profile::GetHostContentSettingsMap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed patch conflict Created 5 years, 3 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/extensions/plugin_apitest.cc ('k') | chrome/browser/geolocation/geolocation_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/webstore_inline_installer_browsertest.cc
diff --git a/chrome/browser/extensions/webstore_inline_installer_browsertest.cc b/chrome/browser/extensions/webstore_inline_installer_browsertest.cc
index 352f17f6d62f6a6acaa09c6cc7ec9fa1b6c9d943..c3f74e9b70c2b62a4675bc482c467b5d26d76424 100644
--- a/chrome/browser/extensions/webstore_inline_installer_browsertest.cc
+++ b/chrome/browser/extensions/webstore_inline_installer_browsertest.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
#include "chrome/browser/extensions/extension_install_prompt.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/tab_helper.h"
@@ -149,10 +150,12 @@ IN_PROC_BROWSER_TEST_F(WebstoreInlineInstallerTest,
GURL install_url =
GenerateTestServerUrl(kAppDomain, "install_from_popup.html");
// Disable popup blocking for the test url.
- browser()->profile()->GetHostContentSettingsMap()->SetContentSetting(
- ContentSettingsPattern::FromURL(install_url),
- ContentSettingsPattern::Wildcard(), CONTENT_SETTINGS_TYPE_POPUPS,
- std::string(), CONTENT_SETTING_ALLOW);
+ HostContentSettingsMapFactory::GetForProfile(browser()->profile())
+ ->SetContentSetting(ContentSettingsPattern::FromURL(install_url),
+ ContentSettingsPattern::Wildcard(),
+ CONTENT_SETTINGS_TYPE_POPUPS,
+ std::string(),
+ CONTENT_SETTING_ALLOW);
ui_test_utils::NavigateToURL(browser(), install_url);
// The test page opens a popup which is a new |browser| window.
Browser* popup_browser = chrome::FindLastActiveWithProfile(
« no previous file with comments | « chrome/browser/extensions/plugin_apitest.cc ('k') | chrome/browser/geolocation/geolocation_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698