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

5 files changed, 10 insertions, 8 deletions

diff --git a/net/test/python_utils.h b/net/test/python_utils.h
index 3077645..ca06021 100644
--- a/net/test/python_utils.h
+++ b/net/test/python_utils.h
@@ -7,9 +7,8 @@
 
 #include "base/compiler_specific.h"
 
-class CommandLine;
-
 namespace base {
+class CommandLine;
 class FilePath;
 }
 
@@ -23,6 +22,6 @@ void AppendToPythonPath(const base::FilePath& dir);
 bool GetPyProtoPath(base::FilePath* dir);
 
 // Returns the command that should be used to launch Python.
-bool GetPythonCommand(CommandLine* python_cmd) WARN_UNUSED_RESULT;
+bool GetPythonCommand(base::CommandLine* python_cmd) WARN_UNUSED_RESULT;
 
 #endif  // NET_TEST_PYTHON_UTILS_H_
diff --git a/net/test/spawned_test_server/local_test_server.cc b/net/test/spawned_test_server/local_test_server.cc
index 7ee12b9..6516136 100644
--- a/net/test/spawned_test_server/local_test_server.cc
+++ b/net/test/spawned_test_server/local_test_server.cc
@@ -22,7 +22,7 @@ namespace {
 
 bool AppendArgumentFromJSONValue(const std::string& key,
                                  const base::Value& value_node,
-                                 CommandLine* command_line) {
+                                 base::CommandLine* command_line) {
   std::string argument_name = "--" + key;
   switch (value_node.GetType()) {
     case base::Value::TYPE_NULL:
@@ -198,7 +198,8 @@ bool LocalTestServer::SetPythonPath() const {
   return true;
 }
 
-bool LocalTestServer::AddCommandLineArguments(CommandLine* command_line) const {
+bool LocalTestServer::AddCommandLineArguments(
+    base::CommandLine* command_line) const {
   base::DictionaryValue arguments_dict;
   if (!GenerateArguments(&arguments_dict))
     return false;
diff --git a/net/test/spawned_test_server/local_test_server.h b/net/test/spawned_test_server/local_test_server.h
index d916835..334c434 100644
--- a/net/test/spawned_test_server/local_test_server.h
+++ b/net/test/spawned_test_server/local_test_server.h
@@ -16,7 +16,9 @@
 #include "base/win/scoped_handle.h"
 #endif
 
+namespace base {
 class CommandLine;
+}
 
 namespace net {
 
@@ -74,7 +76,7 @@ class LocalTestServer : public BaseTestServer {
 
   // Adds the command line arguments for the Python test server to
   // |command_line|. Returns true on success.
-  virtual bool AddCommandLineArguments(CommandLine* command_line) const
+  virtual bool AddCommandLineArguments(base::CommandLine* command_line) const
       WARN_UNUSED_RESULT;
 
   // Returns the actual path of document root for test cases. This function
diff --git a/net/test/spawned_test_server/local_test_server_posix.cc b/net/test/spawned_test_server/local_test_server_posix.cc
index ea9cab6..67911ed 100644
--- a/net/test/spawned_test_server/local_test_server_posix.cc
+++ b/net/test/spawned_test_server/local_test_server_posix.cc
@@ -106,7 +106,7 @@ bool LocalTestServer::LaunchPython(const base::FilePath& testserver_path) {
   // the same environment as the TestServer.
   VLOG(1) << "LaunchPython called with PYTHONPATH = " << getenv(kPythonPathEnv);
 
-  CommandLine python_command(CommandLine::NO_PROGRAM);
+  base::CommandLine python_command(base::CommandLine::NO_PROGRAM);
   if (!GetPythonCommand(&python_command))
     return false;
 
diff --git a/net/test/spawned_test_server/local_test_server_win.cc b/net/test/spawned_test_server/local_test_server_win.cc
index cadebe9..726a581 100644
--- a/net/test/spawned_test_server/local_test_server_win.cc
+++ b/net/test/spawned_test_server/local_test_server_win.cc
@@ -141,7 +141,7 @@ ScopedPath::~ScopedPath() {
 namespace net {
 
 bool LocalTestServer::LaunchPython(const base::FilePath& testserver_path) {
-  CommandLine python_command(CommandLine::NO_PROGRAM);
+  base::CommandLine python_command(base::CommandLine::NO_PROGRAM);
   if (!GetPythonCommand(&python_command))
     return false;