| Index: chrome/browser/popup_blocker_browsertest.cc
|
| diff --git a/chrome/browser/popup_blocker_browsertest.cc b/chrome/browser/popup_blocker_browsertest.cc
|
| index c2e3eded3d193b16c234c60fd13e0cfbd6e285b1..aacbbefde76183bb7a0f4d250da0c950042f1ecf 100644
|
| --- a/chrome/browser/popup_blocker_browsertest.cc
|
| +++ b/chrome/browser/popup_blocker_browsertest.cc
|
| @@ -55,7 +55,7 @@ class PopupBlockerBrowserTest : public InProcessBrowserTest {
|
| // Do a round trip to the renderer first to flush any in-flight IPCs to
|
| // create a to-be-blocked window.
|
| WebContents* tab = browser->tab_strip_model()->GetActiveWebContents();
|
| - CHECK(content::ExecuteScript(tab, ""));
|
| + CHECK(content::ExecuteScript(tab, std::string()));
|
| BlockedContentTabHelper* blocked_content_tab_helper =
|
| BlockedContentTabHelper::FromWebContents(tab);
|
| std::vector<WebContents*> blocked_contents;
|
| @@ -127,12 +127,12 @@ IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, MultiplePopups) {
|
| IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest,
|
| AllowPopupThroughContentSetting) {
|
| GURL url(GetTestURL());
|
| - browser()->profile()->GetHostContentSettingsMap()->SetContentSetting(
|
| - ContentSettingsPattern::FromURL(url),
|
| - ContentSettingsPattern::Wildcard(),
|
| - CONTENT_SETTINGS_TYPE_POPUPS,
|
| - "",
|
| - CONTENT_SETTING_ALLOW);
|
| + browser()->profile()->GetHostContentSettingsMap()
|
| + ->SetContentSetting(ContentSettingsPattern::FromURL(url),
|
| + ContentSettingsPattern::Wildcard(),
|
| + CONTENT_SETTINGS_TYPE_POPUPS,
|
| + std::string(),
|
| + CONTENT_SETTING_ALLOW);
|
|
|
| NavigateAndCheckPopupShown(browser(), url);
|
| }
|
|
|