10 files changed, 21 insertions, 26 deletions
diff --git a/content/public/app/startup_helper_win.h b/content/public/app/startup_helper_win.h
index e3a796a6..6a26b20 100644
--- a/content/public/app/startup_helper_win.h
+++ b/content/public/app/startup_helper_win.h
@@ -5,7 +5,9 @@
 #ifndef CONTENT_PUBLIC_APP_STARTUP_HELPER_WIN_H_
 #define CONTENT_PUBLIC_APP_STARTUP_HELPER_WIN_H_
 
+namespace base {
 class CommandLine;
+}
 
 namespace sandbox {
 struct SandboxInterfaceInfo;
@@ -28,7 +30,7 @@ void InitializeSandboxInfo(sandbox::SandboxInterfaceInfo* sandbox_info);
 void RegisterInvalidParamHandler();
 
 // Sets up the CRT's debugging macros to output to stdout.
-void SetupCRT(const CommandLine& command_line);
+void SetupCRT(const base::CommandLine& command_line);
 
 }  // namespace content
 
diff --git a/content/public/browser/browser_child_process_host.h b/content/public/browser/browser_child_process_host.h
index 9bee9d4..a44b8d3 100644
--- a/content/public/browser/browser_child_process_host.h
+++ b/content/public/browser/browser_child_process_host.h
@@ -15,9 +15,8 @@
 #include "content/public/common/process_type.h"
 #include "ipc/ipc_sender.h"
 
-class CommandLine;
-
 namespace base {
+class CommandLine;
 class FilePath;
 }
 
@@ -45,7 +44,7 @@ class CONTENT_EXPORT BrowserChildProcessHost : public IPC::Sender {
   // Takes ownership of |cmd_line| and |delegate|.
   virtual void Launch(
       SandboxedProcessLauncherDelegate* delegate,
-      CommandLine* cmd_line) = 0;
+      base::CommandLine* cmd_line) = 0;
 
   virtual const ChildProcessData& GetData() const = 0;
 
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 5e412a7..8df5c71 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -34,19 +34,19 @@
 #include "content/public/browser/file_descriptor_info.h"
 #endif
 
-class CommandLine;
 class GURL;
 struct WebPreferences;
 
-namespace blink {
-struct WebWindowFeatures;
-}
-
 namespace base {
+class CommandLine;
 class DictionaryValue;
 class FilePath;
 }
 
+namespace blink {
+struct WebWindowFeatures;
+}
+
 namespace gfx {
 class ImageSkia;
 }
@@ -282,7 +282,7 @@ class CONTENT_EXPORT ContentBrowserClient {
 
   // Allows the embedder to pass extra command line flags.
   // switches::kProcessType will already be set at this point.
-  virtual void AppendExtraCommandLineSwitches(CommandLine* command_line,
+  virtual void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
                                               int child_process_id) {}
 
   // Returns the locale used by the application.
@@ -605,7 +605,7 @@ class CONTENT_EXPORT ContentBrowserClient {
   // Populates |mappings| with all files that need to be mapped before launching
   // a child process.
   virtual void GetAdditionalMappedFilesForChildProcess(
-      const CommandLine& command_line,
+      const base::CommandLine& command_line,
       int child_process_id,
       std::vector<FileDescriptorInfo>* mappings) {}
 #endif
diff --git a/content/public/common/content_client.h b/content/public/common/content_client.h
index 5aba3b6..add53dd 100644
--- a/content/public/common/content_client.h
+++ b/content/public/common/content_client.h
@@ -15,7 +15,6 @@
 #include "content/common/content_export.h"
 #include "ui/base/layout.h"
 
-class CommandLine;
 class GURL;
 
 namespace base {
diff --git a/content/public/common/main_function_params.h b/content/public/common/main_function_params.h
index b9ace95..8a2b826 100644
--- a/content/public/common/main_function_params.h
+++ b/content/public/common/main_function_params.h
@@ -27,7 +27,7 @@ class ScopedNSAutoreleasePool;
 namespace content {
 
 struct MainFunctionParams {
-  explicit MainFunctionParams(const CommandLine& cl)
+  explicit MainFunctionParams(const base::CommandLine& cl)
       : command_line(cl),
 #if defined(OS_WIN)
         sandbox_info(NULL),
@@ -37,7 +37,7 @@ struct MainFunctionParams {
         ui_task(NULL) {
   }
 
-  const CommandLine& command_line;
+  const base::CommandLine& command_line;
 
 #if defined(OS_WIN)
   sandbox::SandboxInterfaceInfo* sandbox_info;
diff --git a/content/public/common/sandbox_init.h b/content/public/common/sandbox_init.h
index f709d23..313662d 100644
--- a/content/public/common/sandbox_init.h
+++ b/content/public/common/sandbox_init.h
@@ -10,9 +10,8 @@
 #include "build/build_config.h"
 #include "content/common/content_export.h"
 
-class CommandLine;
-
 namespace base {
+class CommandLine;
 class FilePath;
 }
 
@@ -59,7 +58,7 @@ CONTENT_EXPORT bool BrokerAddTargetPeer(HANDLE peer_process);
 // then it just has to outlive this method call.
 CONTENT_EXPORT base::ProcessHandle StartSandboxedProcess(
     SandboxedProcessLauncherDelegate* delegate,
-    CommandLine* cmd_line);
+    base::CommandLine* cmd_line);
 
 #elif defined(OS_MACOSX)
 
diff --git a/content/public/test/browser_test_base.h b/content/public/test/browser_test_base.h
index 3dab355..7e36ce6 100644
--- a/content/public/test/browser_test_base.h
+++ b/content/public/test/browser_test_base.h
@@ -11,9 +11,8 @@
 #include "net/test/spawned_test_server/spawned_test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-class CommandLine;
-
 namespace base {
+class CommandLine;
 class FilePath;
 }
 
@@ -53,7 +52,7 @@ class BrowserTestBase : public testing::Test {
   virtual void TearDownOnMainThread() {}
 
   // Override this to add command line flags specific to your test.
-  virtual void SetUpCommandLine(CommandLine* command_line) {}
+  virtual void SetUpCommandLine(base::CommandLine* command_line) {}
 
   // Returns the host resolver being used for the tests. Subclasses might want
   // to configure it inside tests.
diff --git a/content/public/test/browser_test_utils.h b/content/public/test/browser_test_utils.h
index 50310c0..d4a9719 100644
--- a/content/public/test/browser_test_utils.h
+++ b/content/public/test/browser_test_utils.h
@@ -27,8 +27,6 @@
 #include "base/win/scoped_handle.h"
 #endif
 
-class CommandLine;
-
 namespace base {
 class RunLoop;
 }
diff --git a/content/public/test/render_view_test.h b/content/public/test/render_view_test.h
index d0e9d0e..4dec3ab 100644
--- a/content/public/test/render_view_test.h
+++ b/content/public/test/render_view_test.h
@@ -137,7 +137,7 @@ class RenderViewTest : public testing::Test {
   // Used to setup the process so renderers can run.
   scoped_ptr<RendererMainPlatformDelegate> platform_;
   scoped_ptr<MainFunctionParams> params_;
-  scoped_ptr<CommandLine> command_line_;
+  scoped_ptr<base::CommandLine> command_line_;
 
 #if defined(OS_MACOSX)
   scoped_ptr<base::mac::ScopedNSAutoreleasePool> autorelease_pool_;
diff --git a/content/public/test/test_launcher.h b/content/public/test/test_launcher.h
index 5cf4d0f..503547c 100644
--- a/content/public/test/test_launcher.h
+++ b/content/public/test/test_launcher.h
@@ -10,9 +10,8 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 
-class CommandLine;
-
 namespace base {
+class CommandLine;
 class FilePath;
 class RunLoop;
 }
@@ -33,7 +32,7 @@ class TestLauncherDelegate {
  public:
   virtual int RunTestSuite(int argc, char** argv) = 0;
   virtual bool AdjustChildProcessCommandLine(
-      CommandLine* command_line,
+      base::CommandLine* command_line,
       const base::FilePath& temp_data_dir) = 0;
   virtual void PreRunMessageLoop(base::RunLoop* run_loop) {}
   virtual void PostRunMessageLoop() {}