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

net/test/local_test_server.h

-// 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.
 
 #ifndef NET_TEST_LOCAL_TEST_SERVER_H_
 #define NET_TEST_LOCAL_TEST_SERVER_H_
 
 #include <string>
 
 #include "base/file_util.h"
 #include "base/process.h"
@@ skipping 26 matching lines @@
   virtual ~LocalTestServer();
 
   bool Start() WARN_UNUSED_RESULT;
 
   // Stop the server started by Start().
   bool Stop();
 
   // Modify PYTHONPATH to contain libraries we need.
   virtual bool SetPythonPath() const WARN_UNUSED_RESULT;
 
-  // This is a static version so that RunSyncTest in run_testserver.cc can use
-  // it.
-  // TODO(mattm): We should refactor so this isn't necessary (crbug.com/159731).
-  static bool SetPythonPathStatic() WARN_UNUSED_RESULT;
+  // Returns true if the FilePath for the directory of the testserver python
+  // script is successfully stored in |*directory|.
+  virtual bool GetTestServerDirectory(FilePath* directory) const

[Paweł Hajdan Jr., 2013/01/17 23:38:49]

Why not just let the callers extract the directory from GetTestServerPath? This
used to be static before, so thank you for converting that. I think we should go
further and remove it completely. Overriding any of
GetTestServer{Directory,Path} without overriding the other is a recipe for
weirdness.

[Raghu Simha, 2013/01/18 02:17:09]

Agreed. I've removed GetTestServerDirectory. Done.

+      WARN_UNUSED_RESULT;
 
-  // Returns true if successfully stored the FilePath for the directory of the
-  // testserver python script in |*directory|.
-  static bool GetTestServerDirectory(FilePath* directory) WARN_UNUSED_RESULT;
-
-  // Returns true if successfully stored the FilePath for the testserver python
-  // script in |*testserver_path|.
+  // Returns true if the FilePath for the testserver python script is
+  // successfully stored  in |*testserver_path|.
   virtual bool GetTestServerPath(FilePath* testserver_path) const
       WARN_UNUSED_RESULT;
 
   // Adds the command line arguments for the Python test server to
   // |command_line|. Returns true on success.
   virtual bool AddCommandLineArguments(CommandLine* command_line) const
       WARN_UNUSED_RESULT;
 
   // Returns the actual path of document root for test cases. This function
   // should be called by test cases to retrieve the actual document root path.
@@ skipping 27 matching lines @@
   int child_fd_;
   file_util::ScopedFD child_fd_closer_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(LocalTestServer);
 };
 
 }  // namespace net
 
 #endif  // NET_TEST_LOCAL_TEST_SERVER_H_