[sync] Divorce python sync test server chromiumsync.py from testserver.py

net/test/local_test_server.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 "net/test/local_test_server.h"
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
@@ skipping 58 matching lines @@
                                  const FilePath& document_root)
     : BaseTestServer(type, ssl_options) {
   if (!Init(document_root))
     NOTREACHED();
 }
 
 LocalTestServer::~LocalTestServer() {
   Stop();
 }
 
-// static
-bool LocalTestServer::GetTestServerDirectory(FilePath* directory) {
-  // Get path to python server script.
+bool LocalTestServer::GetTestServerPath(FilePath* testserver_path) const {
   FilePath testserver_dir;
   if (!PathService::Get(base::DIR_SOURCE_ROOT, &testserver_dir)) {
     LOG(ERROR) << "Failed to get DIR_SOURCE_ROOT";
     return false;
   }
-
-  testserver_dir = testserver_dir
-      .Append(FILE_PATH_LITERAL("net"))
-      .Append(FILE_PATH_LITERAL("tools"))
-      .Append(FILE_PATH_LITERAL("testserver"));
-  *directory = testserver_dir;
+  testserver_dir = testserver_dir.Append(FILE_PATH_LITERAL("net"))
+                                 .Append(FILE_PATH_LITERAL("tools"))
+                                 .Append(FILE_PATH_LITERAL("testserver"));
+  *testserver_path = testserver_dir.Append(FILE_PATH_LITERAL("testserver.py"));
   return true;
 }
 
-bool LocalTestServer::GetTestServerPath(FilePath* testserver_path) const {
-  if (!GetTestServerDirectory(testserver_path))
-    return false;
-  *testserver_path = testserver_path->Append(FILE_PATH_LITERAL(
-      "testserver.py"));
-  return true;
-}
-
 bool LocalTestServer::Start() {
   // Get path to Python server script.
   FilePath testserver_path;
   if (!GetTestServerPath(&testserver_path))
     return false;
 
   if (!SetPythonPath())
     return false;
 
   if (!LaunchPython(testserver_path))
@@ skipping 44 matching lines @@
     return false;
   SetResourcePath(src_dir.Append(document_root),
                   src_dir.AppendASCII("net")
                          .AppendASCII("data")
                          .AppendASCII("ssl")
                          .AppendASCII("certificates"));
   return true;
 }
 
 bool LocalTestServer::SetPythonPath() const {
-  return SetPythonPathStatic();
-}
-
-// static
-bool LocalTestServer::SetPythonPathStatic() {
   FilePath third_party_dir;
   if (!PathService::Get(base::DIR_SOURCE_ROOT, &third_party_dir)) {
     LOG(ERROR) << "Failed to get DIR_SOURCE_ROOT";
     return false;
   }
   third_party_dir = third_party_dir.AppendASCII("third_party");
 
   // For simplejson. (simplejson, unlike all the other Python modules
   // we include, doesn't have an extra 'simplejson' directory, so we
   // need to include its parent directory, i.e. third_party_dir).
   AppendToPythonPath(third_party_dir);
 
   AppendToPythonPath(third_party_dir.AppendASCII("tlslite"));
   AppendToPythonPath(
       third_party_dir.AppendASCII("pyftpdlib").AppendASCII("src"));
   AppendToPythonPath(
       third_party_dir.AppendASCII("pywebsocket").AppendASCII("src"));
 
   // Locate the Python code generated by the protocol buffers compiler.
   FilePath pyproto_dir;
   if (!GetPyProtoPath(&pyproto_dir)) {
     LOG(WARNING) << "Cannot find pyproto dir for generated code. "
                  << "Testserver features that rely on it will not work";
     return true;
   }
+  AppendToPythonPath(pyproto_dir);
 
-  AppendToPythonPath(pyproto_dir);
-  AppendToPythonPath(pyproto_dir.AppendASCII("sync").AppendASCII("protocol"));
+  // TODO(cloud_policy): Move this out of net/, since net/ should not have to
+  // depend on chrome/. See http://crbug.com/119403.
   AppendToPythonPath(pyproto_dir.AppendASCII("chrome")
                                 .AppendASCII("browser")
                                 .AppendASCII("policy")
                                 .AppendASCII("proto"));
 
   return true;
 }
 
 bool LocalTestServer::AddCommandLineArguments(CommandLine* command_line) const {
   base::DictionaryValue arguments_dict;
@@ skipping 16 matching lines @@
         if (!AppendArgumentFromJSONValue(key, *(*list_it), command_line))
           return false;
       }
     } else if (!AppendArgumentFromJSONValue(key, value, command_line)) {
         return false;
     }
   }
 
   // Append the appropriate server type argument.
   switch (type()) {
-    case TYPE_HTTP:
+    case TYPE_HTTP:  // The default type is HTTP, no argument required.
+      break;
     case TYPE_HTTPS:
-      // The default type is HTTP, no argument required.
+      command_line->AppendArg("--https");
       break;
     case TYPE_WS:
     case TYPE_WSS:
       command_line->AppendArg("--websocket");
       break;
     case TYPE_FTP:
-      command_line->AppendArg("-f");
-      break;
-    case TYPE_SYNC:
-      command_line->AppendArg("--sync");
+      command_line->AppendArg("--ftp");
       break;
     case TYPE_TCP_ECHO:
       command_line->AppendArg("--tcp-echo");
       break;
     case TYPE_UDP_ECHO:
       command_line->AppendArg("--udp-echo");
       break;
     case TYPE_BASIC_AUTH_PROXY:
       command_line->AppendArg("--basic-auth-proxy");
       break;
     default:
       NOTREACHED();
       return false;
   }
 
   return true;
 }
 
 }  // namespace net