| Index: chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc
|
| diff --git a/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc b/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc
|
| index 687f3e141d2e3ebea70018d0f33604a219889d93..5aa4db7456b13cdd229404b925b09a3a2db88f74 100644
|
| --- a/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc
|
| +++ b/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc
|
| @@ -266,7 +266,8 @@ IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest,
|
| BlockWebContentsCreation) {
|
| #if defined(OS_WIN) && defined(USE_ASH)
|
| // Disable this test in Metro+Ash for now (http://crbug.com/262796).
|
| - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
|
| + if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kAshBrowserTests))
|
| return;
|
| #endif
|
|
|
| @@ -281,7 +282,8 @@ IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest,
|
| BlockWebContentsCreationIncognito) {
|
| #if defined(OS_WIN) && defined(USE_ASH)
|
| // Disable this test in Metro+Ash for now (http://crbug.com/262796).
|
| - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
|
| + if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kAshBrowserTests))
|
| return;
|
| #endif
|
|
|
| @@ -296,7 +298,8 @@ IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest,
|
| PopupBlockedFakeClickOnAnchor) {
|
| #if defined(OS_WIN) && defined(USE_ASH)
|
| // Disable this test in Metro+Ash for now (http://crbug.com/262796).
|
| - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
|
| + if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kAshBrowserTests))
|
| return;
|
| #endif
|
|
|
| @@ -311,7 +314,8 @@ IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest,
|
| PopupBlockedFakeClickOnAnchorNoTarget) {
|
| #if defined(OS_WIN) && defined(USE_ASH)
|
| // Disable this test in Metro+Ash for now (http://crbug.com/262796).
|
| - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
|
| + if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kAshBrowserTests))
|
| return;
|
| #endif
|
|
|
| @@ -381,7 +385,7 @@ IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest,
|
|
|
| IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest,
|
| PopupsLaunchWhenTabIsClosed) {
|
| - CommandLine::ForCurrentProcess()->AppendSwitch(
|
| + base::CommandLine::ForCurrentProcess()->AppendSwitch(
|
| switches::kDisablePopupBlocking);
|
| GURL url(
|
| embedded_test_server()->GetURL("/popup_blocker/popup-on-unload.html"));
|
| @@ -394,7 +398,7 @@ IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest,
|
| // Verify that when you unblock popup, the popup shows in history and omnibox.
|
| IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest,
|
| UnblockedPopupShowsInHistoryAndOmnibox) {
|
| - CommandLine::ForCurrentProcess()->AppendSwitch(
|
| + base::CommandLine::ForCurrentProcess()->AppendSwitch(
|
| switches::kDisablePopupBlocking);
|
| GURL url(embedded_test_server()->GetURL(
|
| "/popup_blocker/popup-blocked-to-post-blank.html"));
|
|
|