Move CommandLine to base namespace.

Fix all forward-declares and header files referencing CommandLine.

This keeps a "using base::CommandLine" in the command line header file so that the rest of the source files can be changes in a follow-up.

TBR=sky

Review URL: https://codereview.chromium.org/196413016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257514 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 32 insertions, 26 deletions

diff --git a/chrome/browser/ui/app_list/app_list_service.h b/chrome/browser/ui/app_list/app_list_service.h
index 4ee6604..91fbe7f 100644
--- a/chrome/browser/ui/app_list/app_list_service.h
+++ b/chrome/browser/ui/app_list/app_list_service.h
@@ -13,11 +13,11 @@
 #include "ui/gfx/native_widget_types.h"
 
 class AppListControllerDelegate;
-class CommandLine;
 class PrefRegistrySimple;
 class Profile;
 
 namespace base {
+class CommandLine;
 class FilePath;
 }
 
@@ -51,7 +51,7 @@ class AppListService {
 
   static void RegisterPrefs(PrefRegistrySimple* registry);
 
-  static void RecordShowTimings(const CommandLine& command_line);
+  static void RecordShowTimings(const base::CommandLine& command_line);
 
   // Indicates that |callback| should be called next time the app list is
   // painted.
diff --git a/chrome/browser/ui/app_list/app_list_service_disabled.cc b/chrome/browser/ui/app_list/app_list_service_disabled.cc
index 484358d..4e7b5d1 100644
--- a/chrome/browser/ui/app_list/app_list_service_disabled.cc
+++ b/chrome/browser/ui/app_list/app_list_service_disabled.cc
@@ -66,4 +66,4 @@ void AppListService::InitAll(Profile* initial_profile) {}
 void AppListService::RegisterPrefs(PrefRegistrySimple* registry) {}
 
 // static
-void AppListService::RecordShowTimings(const CommandLine& command_line) {}
+void AppListService::RecordShowTimings(const base::CommandLine& command_line) {}
diff --git a/chrome/browser/ui/app_list/app_list_service_impl.h b/chrome/browser/ui/app_list/app_list_service_impl.h
index 213da34..55660cd 100644
--- a/chrome/browser/ui/app_list/app_list_service_impl.h
+++ b/chrome/browser/ui/app_list/app_list_service_impl.h
@@ -31,7 +31,7 @@ class AppListServiceImpl : public AppListService,
   virtual ~AppListServiceImpl();
 
   // Constructor used for testing.
-  AppListServiceImpl(const CommandLine& command_line,
+  AppListServiceImpl(const base::CommandLine& command_line,
                      PrefService* local_state,
                      scoped_ptr<ProfileStore> profile_store,
                      scoped_ptr<KeepAliveService> keep_alive_service);
@@ -83,7 +83,7 @@ class AppListServiceImpl : public AppListService,
 
   scoped_ptr<ProfileStore> profile_store_;
   base::WeakPtrFactory<AppListServiceImpl> weak_factory_;
-  CommandLine command_line_;
+  base::CommandLine command_line_;
   PrefService* local_state_;
   scoped_ptr<ProfileLoader> profile_loader_;
 
diff --git a/chrome/browser/ui/extensions/application_launch.h b/chrome/browser/ui/extensions/application_launch.h
index 280d549..e18211a 100644
--- a/chrome/browser/ui/extensions/application_launch.h
+++ b/chrome/browser/ui/extensions/application_launch.h
@@ -14,9 +14,12 @@
 #include "url/gurl.h"
 
 class Browser;
-class CommandLine;
 class Profile;
 
+namespace base {
+class CommandLine;
+}
+
 namespace content {
 class WebContents;
 }
@@ -72,7 +75,7 @@ struct AppLaunchParams {
 
   // If non-empty, information from the command line may be passed on to the
   // application.
-  CommandLine command_line;
+  base::CommandLine command_line;
 
   // If non-empty, the current directory from which any relative paths on the
   // command line should be expanded from.
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_util.h b/chrome/browser/ui/libgtk2ui/gtk2_util.h
index d58038d..20daa6e 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_util.h
+++ b/chrome/browser/ui/libgtk2ui/gtk2_util.h
@@ -8,10 +8,10 @@
 #include <gtk/gtk.h>
 #include <string>
 
-class CommandLine;
 class SkBitmap;
 
 namespace base {
+class CommandLine;
 class Environment;
 }
 
@@ -21,7 +21,7 @@ class Accelerator;
 
 namespace libgtk2ui {
 
-void GtkInitFromCommandLine(const CommandLine& command_line);
+void GtkInitFromCommandLine(const base::CommandLine& command_line);
 
 // Returns the name of the ".desktop" file associated with our running process.
 std::string GetDesktopName(base::Environment* env);
diff --git a/chrome/browser/ui/panels/base_panel_browser_test.h b/chrome/browser/ui/panels/base_panel_browser_test.h
index bd5a10d4..abe638f 100644
--- a/chrome/browser/ui/panels/base_panel_browser_test.h
+++ b/chrome/browser/ui/panels/base_panel_browser_test.h
@@ -55,7 +55,7 @@ class BasePanelBrowserTest : public InProcessBrowserTest {
   // tests to ensure we still have coverage on the bots.
   bool SkipTestIfCompizWM();
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
+  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
   virtual void SetUpOnMainThread() OVERRIDE;
 
  protected:
diff --git a/chrome/browser/ui/startup/startup_browser_creator.h b/chrome/browser/ui/startup/startup_browser_creator.h
index 8496d2b..9cef54f 100644
--- a/chrome/browser/ui/startup/startup_browser_creator.h
+++ b/chrome/browser/ui/startup/startup_browser_creator.h
@@ -18,10 +18,13 @@
 #include "url/gurl.h"
 
 class Browser;
-class CommandLine;
 class GURL;
 class PrefService;
 
+namespace base {
+class CommandLine;
+}
+
 // class containing helpers for BrowserMain to spin up a new instance and
 // initialize the profile.
 class StartupBrowserCreator {
@@ -37,7 +40,7 @@ class StartupBrowserCreator {
 
   // This function is equivalent to ProcessCommandLine but should only be
   // called during actual process startup.
-  bool Start(const CommandLine& cmd_line,
+  bool Start(const base::CommandLine& cmd_line,
              const base::FilePath& cur_dir,
              Profile* last_used_profile,
              const Profiles& last_opened_profiles,
@@ -54,7 +57,7 @@ class StartupBrowserCreator {
   // |startup_profile_dir| is the directory that contains the profile that the
   // command line arguments will be executed under.
   static void ProcessCommandLineAlreadyRunning(
-      const CommandLine& command_line,
+      const base::CommandLine& command_line,
       const base::FilePath& cur_dir,
       const base::FilePath& startup_profile_dir);
 
@@ -72,7 +75,7 @@ class StartupBrowserCreator {
   // implies that the directory of the executable should be used.
   // |process_startup| indicates whether this is the first browser.
   // |is_first_run| indicates that this is a new profile.
-  bool LaunchBrowser(const CommandLine& command_line,
+  bool LaunchBrowser(const base::CommandLine& command_line,
                      Profile* profile,
                      const base::FilePath& cur_dir,
                      chrome::startup::IsProcessStartup is_process_startup,
@@ -85,7 +88,7 @@ class StartupBrowserCreator {
   static bool WasRestarted();
 
   static SessionStartupPref GetSessionStartupPref(
-      const CommandLine& command_line,
+      const base::CommandLine& command_line,
       Profile* profile);
 
   void set_is_default_browser_dialog_suppressed(bool new_value) {
@@ -121,11 +124,11 @@ class StartupBrowserCreator {
   // Returns the list of URLs to open from the command line. The returned
   // vector is empty if the user didn't specify any URLs on the command line.
   static std::vector<GURL> GetURLsFromCommandLine(
-      const CommandLine& command_line,
+      const base::CommandLine& command_line,
       const base::FilePath& cur_dir,
       Profile* profile);
 
-  static bool ProcessCmdLineImpl(const CommandLine& command_line,
+  static bool ProcessCmdLineImpl(const base::CommandLine& command_line,
                                  const base::FilePath& cur_dir,
                                  bool process_startup,
                                  Profile* last_used_profile,
@@ -135,7 +138,7 @@ class StartupBrowserCreator {
 
   // Callback after a profile has been created.
   static void ProcessCommandLineOnProfileCreated(
-      const CommandLine& command_line,
+      const base::CommandLine& command_line,
       const base::FilePath& cur_dir,
       Profile* profile,
       Profile::CreateStatus status);
@@ -173,6 +176,6 @@ bool HasPendingUncleanExit(Profile* profile);
 // Returns the path that contains the profile that should be loaded on process
 // startup.
 base::FilePath GetStartupProfilePath(const base::FilePath& user_data_dir,
-                                     const CommandLine& command_line);
+                                     const base::CommandLine& command_line);
 
 #endif  // CHROME_BROWSER_UI_STARTUP_STARTUP_BROWSER_CREATOR_H_
diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.h b/chrome/browser/ui/startup/startup_browser_creator_impl.h
index a5ae4585..b50c9c7 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.h
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.h
@@ -16,11 +16,11 @@
 #include "url/gurl.h"
 
 class Browser;
-class CommandLine;
 class Profile;
 class StartupBrowserCreator;
 
 namespace base {
+class CommandLine;
 class FilePath;
 }
 
@@ -45,10 +45,10 @@ class StartupBrowserCreatorImpl {
   // second one is always called when the browser starts even if it is not
   // the first run.  |is_first_run| indicates that this is a new profile.
   StartupBrowserCreatorImpl(const base::FilePath& cur_dir,
-                            const CommandLine& command_line,
+                            const base::CommandLine& command_line,
                             chrome::startup::IsFirstRun is_first_run);
   StartupBrowserCreatorImpl(const base::FilePath& cur_dir,
-                            const CommandLine& command_line,
+                            const base::CommandLine& command_line,
                             StartupBrowserCreator* browser_creator,
                             chrome::startup::IsFirstRun is_first_run);
   ~StartupBrowserCreatorImpl();
@@ -159,7 +159,7 @@ class StartupBrowserCreatorImpl {
       const std::vector<GURL>& startup_urls);
 
   const base::FilePath cur_dir_;
-  const CommandLine& command_line_;
+  const base::CommandLine& command_line_;
   Profile* profile_;
   StartupBrowserCreator* browser_creator_;
   bool is_first_run_;
diff --git a/chrome/browser/ui/webui/bidi_checker_web_ui_test.h b/chrome/browser/ui/webui/bidi_checker_web_ui_test.h
index 02c38b9..0082e10 100644
--- a/chrome/browser/ui/webui/bidi_checker_web_ui_test.h
+++ b/chrome/browser/ui/webui/bidi_checker_web_ui_test.h
@@ -34,7 +34,7 @@ class WebUIBidiCheckerBrowserTest : public WebUIBrowserTest {
 
  private:
   // The command line args used to run the test before being changed in SetUp().
-  CommandLine::StringVector argv_;
+  base::CommandLine::StringVector argv_;
 };
 
 // Base class for BidiChecker-based tests that run with an LTR UI.
diff --git a/chrome/browser/ui/webui/downloads_ui_browsertest.h b/chrome/browser/ui/webui/downloads_ui_browsertest.h
index d38ee1e..6272e87 100644
--- a/chrome/browser/ui/webui/downloads_ui_browsertest.h
+++ b/chrome/browser/ui/webui/downloads_ui_browsertest.h
@@ -24,7 +24,7 @@ class DownloadsUIBrowserTest : public WebUIBrowserTest {
 class DownloadsWebUIForSupervisedUsersTest : public DownloadsUIBrowserTest {
  public:
   // InProcessBrowserTest overrides:
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
+  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_DOWNLOADS_UI_BROWSERTEST_H_
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.h b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.h
index 17830d1..252a22c 100644
--- a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.h
+++ b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.h
@@ -23,7 +23,7 @@ class NetInternalsTest : public WebUIBrowserTest {
   class MessageHandler;
 
   // InProcessBrowserTest overrides.
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
+  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
   virtual void SetUpOnMainThread() OVERRIDE;
 
   // WebUIBrowserTest implementation.