Re-apply http://codereview.chromium.org/1622012

net/socket/ssl_test_util.cc

Index: net/socket/ssl_test_util.cc
diff --git a/net/socket/ssl_test_util.cc b/net/socket/ssl_test_util.cc
index ce3589af5fa18b81f50950423d52c8ad385cc991..81f5022a8b3aed099ed5a1df4483f017fdf43ed9 100644
--- a/net/socket/ssl_test_util.cc
+++ b/net/socket/ssl_test_util.cc
@@ -89,7 +89,7 @@ void AppendToPythonPath(const FilePath& dir) {
     SetEnvironmentVariableW(kPythonPath, dir.value().c_str());
   } else if (!wcsstr(oldpath, dir.value().c_str())) {
     std::wstring newpath(oldpath);
-    newpath.append(L":");
+    newpath.append(L";");
     newpath.append(dir.value());
     SetEnvironmentVariableW(kPythonPath, newpath.c_str());
   }
@@ -117,6 +117,13 @@ void TestServerLauncher::SetPythonPath() {
 
   AppendToPythonPath(third_party_dir.Append(FILE_PATH_LITERAL("tlslite")));
   AppendToPythonPath(third_party_dir.Append(FILE_PATH_LITERAL("pyftpdlib")));
+
+  // Locate the Python code generated by the protocol buffers compiler.
+  FilePath generated_code_dir;
+  CHECK(PathService::Get(base::DIR_EXE, &generated_code_dir));
+  generated_code_dir = generated_code_dir.Append(FILE_PATH_LITERAL("pyproto"));
+  AppendToPythonPath(generated_code_dir);
+  AppendToPythonPath(generated_code_dir.Append(FILE_PATH_LITERAL("sync_pb")));
 }
 
 bool TestServerLauncher::Start(Protocol protocol,