2 files changed, 16 insertions, 15 deletions
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
index 8f0eb49..304b16a 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -73,7 +73,6 @@ class SSLUITest : public InProcessBrowserTest {
   DISALLOW_COPY_AND_ASSIGN(SSLUITest);
 };
 
-#if defined(OS_WIN)
 // Visits a regular page over http.
 IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTP) {
   scoped_refptr<HTTPTestServer> server = PlainServer();
@@ -712,20 +711,6 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestUnauthenticatedFrameNavigation) {
       content_frame_xpath, is_frame_evil_js, &is_content_evil));
   EXPECT_FALSE(is_content_evil);
 }
-#else
-// TODO(port): enable the real tests.
-IN_PROC_BROWSER_TEST_F(SSLUITest, PhonyTest1) {
-  EXPECT_TRUE(true);
-}
-
-IN_PROC_BROWSER_TEST_F(SSLUITest, PhonyTest2) {
-  EXPECT_TRUE(false);
-}
-
-IN_PROC_BROWSER_TEST_F(SSLUITest, PhonyTest3) {
-  EXPECT_TRUE(true);
-}
-#endif
 
 // TODO(jcampan): more tests to do below.
 
diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc
index 75a9c2d..64007de 100644
--- a/chrome/test/in_process_browser_test.cc
+++ b/chrome/test/in_process_browser_test.cc
@@ -187,6 +187,22 @@ void InProcessBrowserTest::RunTestOnMainThreadLoop() {
     return;
   }
 
+
+  // Before we run the browser, we have to hack the path to the exe to match
+  // what it would be if Chrome was running, because it is used to fork renderer
+  // processes, on Linux at least (failure to do so will cause a browser_test to
+  // be run instead of a renderer).
+  FilePath chrome_path;
+  CHECK(PathService::Get(base::FILE_EXE, &chrome_path));
+  chrome_path = chrome_path.DirName();
+#if defined(OS_WIN)
+  chrome_path = chrome_path.Append(chrome::kBrowserProcessExecutablePath);
+#elif defined(OS_POSIX)
+  chrome_path = chrome_path.Append(
+      WideToASCII(chrome::kBrowserProcessExecutablePath));
+#endif
+  CHECK(PathService::Override(base::FILE_EXE, chrome_path));
+
   browser_ = CreateBrowser(profile);
 
   RunTestOnMainThread();