Fix NamedProxyLauncher on Windows.

chrome/test/automation/proxy_launcher.cc

 // Copyright (c) 2011 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 "chrome/test/automation/proxy_launcher.h"
 
 #include "app/sql/connection.h"
 #include "base/environment.h"
 #include "base/file_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/stringprintf.h"
 #include "base/test/test_file_util.h"
 #include "base/test/test_timeouts.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/common/automation_constants.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/chrome_process_util.h"
 #include "chrome/test/test_launcher_utils.h"
 #include "chrome/test/test_switches.h"
 #include "chrome/test/automation/automation_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "content/common/child_process_info.h"
 #include "content/common/debug_flags.h"
+#include "ipc/ipc_channel_win.h"
+
+#if defined(OS_WIN)
+#include <windows.h>
+#endif
 
 namespace {
 
 // Passed as value of kTestType.
 const char kUITestType[] = "ui";
 
 // We want to have a current history database when we start the browser so
 // things like the NTP will have thumbnails.  This method updates the dates
 // in the history to be more recent.
 void UpdateHistoryDates(const FilePath& user_data_dir) {
@@ skipping 16 matching lines @@
       yesterday_str.c_str());
   ASSERT_TRUE(db.Execute(query.c_str()));
   db.Close();
   file_util::EvictFileFromSystemCache(history);
 }
 
 }  // namespace
 
 // ProxyLauncher functions
 
-const char ProxyLauncher::kDefaultInterfacePath[] =
+#if defined(OS_WIN)
+const char ProxyLauncher::kDefaultInterfaceId[] = "ChromeTestingInterface";
+#elif defined(OS_POSIX)
+const char ProxyLauncher::kDefaultInterfaceId[] =
     "/var/tmp/ChromeTestingInterface";
+#endif
 
 bool ProxyLauncher::in_process_renderer_ = false;
 bool ProxyLauncher::no_sandbox_ = false;
 bool ProxyLauncher::full_memory_dump_ = false;
 bool ProxyLauncher::show_error_dialogs_ = true;
 bool ProxyLauncher::dump_histograms_on_exit_ = false;
 bool ProxyLauncher::enable_dcheck_ = false;
 bool ProxyLauncher::silent_dump_on_dcheck_ = false;
 bool ProxyLauncher::disable_breakpad_ = false;
 std::string ProxyLauncher::js_flags_ = "";
@@ skipping 428 matching lines @@
 AutomationProxy* NamedProxyLauncher::CreateAutomationProxy(
     int execution_timeout) {
   AutomationProxy* proxy = new AutomationProxy(execution_timeout,
                                                disconnect_on_failure_);
   proxy->InitializeChannel(channel_id_, true);
   return proxy;
 }
 
 void NamedProxyLauncher::InitializeConnection(const LaunchState& state,
                                               bool wait_for_initial_loads) {
-  FilePath testing_channel_path;
-#if defined(OS_WIN)
-  testing_channel_path = FilePath(ASCIIToWide(channel_id_));
-#else
-  testing_channel_path = FilePath(channel_id_);
-#endif
-
   if (launch_browser_) {
+#if defined(OS_POSIX)
     // Because we are waiting on the existence of the testing file below,
     // make sure there isn't one already there before browser launch.
-    EXPECT_TRUE(file_util::Delete(testing_channel_path, false));
+    EXPECT_TRUE(file_util::Delete(FilePath(channel_id_), false));
+#endif
 
     // Set up IPC testing interface as a client.
     ASSERT_TRUE(LaunchBrowser(state));
   }
 
   // Wait for browser to be ready for connections.
+  const int kPollIntervalMs = 50;
   bool testing_channel_exists = false;
   for (int wait_time = 0;
        wait_time < TestTimeouts::action_max_timeout_ms();
-       wait_time += automation::kSleepTime) {
-    testing_channel_exists = file_util::PathExists(testing_channel_path);
+       wait_time += kPollIntervalMs) {
+#if defined(OS_WIN)
+    testing_channel_exists = WaitNamedPipe(
+        IPC::PipeNameFromChannelId(channel_id_).c_str(),
+        1);

[dmac, 2011/08/02 00:32:14]

on Windows does it not make more sense just to call WaitNamedPipe(name,
TestTimeouts::action_max_timout_ms())?

[kkania, 2011/08/02 15:00:58]

WaitNamedPipe on windows returns immediately if the pipe doesn't exist yet. The
wait param supposedly only comes into play when waiting for an existing pipe to
be available for connection

+#elif defined(OS_POSIX)
+    testing_channel_exists = file_util::PathExists(FilePath(channel_id_));
+#endif
     if (testing_channel_exists)
       break;
-    base::PlatformThread::Sleep(automation::kSleepTime);
+    base::PlatformThread::Sleep(kPollIntervalMs);
   }
   EXPECT_TRUE(testing_channel_exists);
 
   ASSERT_TRUE(ConnectToRunningBrowser(wait_for_initial_loads));
 }
 
 void NamedProxyLauncher::TerminateConnection() {
   if (launch_browser_)
     CloseBrowserAndServer();
   else
@@ skipping 26 matching lines @@
   ASSERT_TRUE(LaunchBrowserAndServer(state, wait_for_initial_loads));
 }
 
 void AnonymousProxyLauncher::TerminateConnection() {
   CloseBrowserAndServer();
 }
 
 std::string AnonymousProxyLauncher::PrefixedChannelID() const {
   return channel_id_;
 }