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

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

Issue 819133004: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 6 years 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
Index: chrome/browser/extensions/window_open_apitest.cc
diff --git a/chrome/browser/extensions/window_open_apitest.cc b/chrome/browser/extensions/window_open_apitest.cc
index aa34d26972a45b89647a70403cc5eb33d91e7181..fd61a908df6aa26b2b67b83092028ac733a53b56 100644
--- a/chrome/browser/extensions/window_open_apitest.cc
+++ b/chrome/browser/extensions/window_open_apitest.cc
@@ -48,7 +48,7 @@ using content::WebContents;
// Disabled, http://crbug.com/64899.
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_WindowOpen) {
- CommandLine::ForCurrentProcess()->AppendSwitch(
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
extensions::switches::kEnableExperimentalExtensionApis);
extensions::ResultCatcher catcher;
@@ -232,7 +232,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WindowArgumentsOverflow) {
}
class WindowOpenPanelDisabledTest : public ExtensionApiTest {
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
ExtensionApiTest::SetUpCommandLine(command_line);
// TODO(jennb): Re-enable when panels are enabled by default.
// command_line->AppendSwitch(switches::kDisablePanels);
@@ -245,7 +245,7 @@ IN_PROC_BROWSER_TEST_F(WindowOpenPanelDisabledTest,
}
class WindowOpenPanelTest : public ExtensionApiTest {
- void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
ExtensionApiTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(switches::kEnablePanels);
}
@@ -287,14 +287,16 @@ IN_PROC_BROWSER_TEST_F(WindowOpenPanelTest,
MAYBE_CloseNonExtensionPanelsOnUninstall) {
#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
#if defined(USE_ASH_PANELS)
// On Ash, new panel windows open as popup windows instead.
int num_popups, num_panels;
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnablePanels)) {
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnablePanels)) {
num_popups = 2;
num_panels = 2;
} else {
@@ -340,7 +342,8 @@ IN_PROC_BROWSER_TEST_F(WindowOpenPanelTest,
// Expect everything else, including panels, to close.
num_popups -= 1;
#if defined(USE_ASH_PANELS)
- if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnablePanels)) {
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnablePanels)) {
// On Ash, new panel windows open as popup windows instead, so there are 2
// extension domain popups that will close (instead of 1 popup on non-Ash).
num_popups -= 1;
« no previous file with comments | « chrome/browser/extensions/webstore_installer_test.cc ('k') | chrome/browser/extensions/window_open_interactive_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698