Fix sync integration tests by fixing Python path.

The generated Python proto output paths now match the input paths.

Reland of r97696 with CHECK removed.

Review URL: http://codereview.chromium.org/7711005

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

1 files changed, 8 insertions, 6 deletions

diff --git a/net/test/test_server.cc b/net/test/test_server.cc
index 8723215..d76430d 100644
--- a/net/test/test_server.cc
+++ b/net/test/test_server.cc
@@ -304,17 +304,19 @@ bool TestServer::SetPythonPath() {
       third_party_dir.AppendASCII("pyftpdlib").AppendASCII("src"));
 
   // Locate the Python code generated by the protocol buffers compiler.
-  FilePath pyproto_code_dir;
-  if (!GetPyProtoPath(&pyproto_code_dir)) {
+  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_code_dir);
-  AppendToPythonPath(pyproto_code_dir.Append(FILE_PATH_LITERAL("sync_pb")));
-  AppendToPythonPath(pyproto_code_dir.Append(
-      FILE_PATH_LITERAL("device_management_pb")));
+  AppendToPythonPath(pyproto_dir);
+  AppendToPythonPath(pyproto_dir.AppendASCII("chrome")
+                       .AppendASCII("browser")
+                       .AppendASCII("sync")
+                       .AppendASCII("protocol"));
+  AppendToPythonPath(pyproto_dir.AppendASCII("device_management_pb"));
 
   return true;
 }