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

net/socket/ssl_test_util.cc

 // Copyright (c) 2009 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/socket/ssl_test_util.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 71 matching lines @@
   // Do nothing if dir already on path.
 
 #if defined(OS_WIN)
   const wchar_t kPythonPath[] = L"PYTHONPATH";
   // TODO(dkegel): handle longer PYTHONPATH variables
   wchar_t oldpath[4096];
   if (GetEnvironmentVariable(kPythonPath, oldpath, arraysize(oldpath)) == 0) {
     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());
   }
 #elif defined(OS_POSIX)
   const char kPythonPath[] = "PYTHONPATH";
   const char* oldpath = getenv(kPythonPath);
   // setenv() leaks memory intentionally on Mac
   if (!oldpath) {
     setenv(kPythonPath, dir.value().c_str(), 1);
   } else if (!strstr(oldpath, dir.value().c_str())) {
     std::string newpath(oldpath);
     newpath.append(":");
     newpath.append(dir.value());
     setenv(kPythonPath, newpath.c_str(), 1);
   }
 #endif
 }
 
 }  // end namespace
 
 void TestServerLauncher::SetPythonPath() {
   FilePath third_party_dir;
   CHECK(PathService::Get(base::DIR_SOURCE_ROOT, &third_party_dir));
   third_party_dir = third_party_dir.Append(FILE_PATH_LITERAL("third_party"));
 
   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,
                                const std::string& host_name, int port,
                                const FilePath& document_root,
                                const FilePath& cert_path,
                                const std::wstring& file_root_url) {
   if (!cert_path.value().empty()) {
     if (!LoadTestRootCert())
       return false;
@@ skipping 210 matching lines @@
                   "certificate to your trusted roots for this test to work. "
                   "For more info visit:\n"
                   "http://dev.chromium.org/developers/testing\n";
     return false;
   }
 #endif
   return true;
 }
 
 }  // namespace net