Make callers of CommandLine use it via the base:: namespace.

chrome/browser/extensions/window_open_apitest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/memory/scoped_vector.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 30 matching lines @@
 // TODO(stevenjb): Figure out the correct behavior for Ash + Win
 #define USE_ASH_PANELS
 #endif
 
 using content::OpenURLParams;
 using content::Referrer;
 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;
   ASSERT_TRUE(LoadExtensionIncognito(test_data_dir_
       .AppendASCII("window_open").AppendASCII("spanning")));
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 int GetPanelCount(Browser* browser) {
 #if defined(USE_ASH_PANELS)
@@ skipping 163 matching lines @@
       ui::PAGE_TRANSITION_TYPED, false));
 
   EXPECT_TRUE(WaitForTabsAndPopups(browser(), 3, 1, 0));
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WindowArgumentsOverflow) {
   ASSERT_TRUE(RunExtensionTest("window_open/argument_overflow")) << message_;
 }
 
 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);
   }
 };
 
 IN_PROC_BROWSER_TEST_F(WindowOpenPanelDisabledTest,
                        DISABLED_WindowOpenPanelNotEnabled) {
   ASSERT_TRUE(RunExtensionTest("window_open/panel_not_enabled")) << message_;
 }
 
 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);
   }
 };
 
 #if defined(USE_ASH_PANELS)
 // On Ash, this currently fails because we're currently opening new panel
 // windows as popup windows instead.
 #define MAYBE_WindowOpenPanel DISABLED_WindowOpenPanel
 #else
@@ skipping 21 matching lines @@
 #define MAYBE_CloseNonExtensionPanelsOnUninstall \
   DISABLED_CloseNonExtensionPanelsOnUninstall
 #else
 #define MAYBE_CloseNonExtensionPanelsOnUninstall \
   CloseNonExtensionPanelsOnUninstall
 #endif
 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 {
     num_popups = 4;
     num_panels = 0;
   }
 #else
   int num_popups = 2;
   int num_panels = 2;
 #endif
@@ skipping 25 matching lines @@
   // Wait on test messages to make sure the pages loaded.
   for (size_t i = 0; i < listeners.size(); ++i)
     ASSERT_TRUE(listeners[i]->WaitUntilSatisfied());
 
   UninstallExtension(extension->id());
 
   // Wait for the tabs and popups in non-extension domain to stay open.
   // 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;
   }
 #endif
 #if defined(USE_ASH)
 #if !defined(OS_WIN)
   // On linux ash we close all popup applications when closing its extension.
   num_popups = 0;
 #endif
@@ skipping 149 matching lines @@
                      last_loaded_extension_id() + "/newtab.html"),
                  false,
                  &newtab));
 
   // Extension API should succeed.
   bool result = false;
   ASSERT_TRUE(content::ExecuteScriptAndExtractBool(newtab, "testExtensionApi()",
                                                    &result));
   EXPECT_TRUE(result);
 }