Add option for url_fetch_test to wait for a JS expression...

chrome/test/url_fetch_test/url_fetch_test.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 "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
@@ skipping 35 matching lines @@
 #endif
       browser_directory_ = dir;
     }
     UITest::SetUp();
   }
 
   void RunTest(const GURL& url,
                const char* wait_cookie_name,
                const char* wait_cookie_value,
                const char* var_to_fetch,
-               const std::wstring& wait_js_expr,
-               const std::wstring& wait_js_frame_xpath,
+               const std::string& wait_js_expr,
+               const std::string& wait_js_frame_xpath,
                int wait_js_timeout_ms,
                UrlFetchTestResult* result) {
     scoped_refptr<TabProxy> tab(GetActiveTab());
     ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(url));
 
     if (wait_cookie_name) {
       if (wait_cookie_value) {
         bool completed = WaitUntilCookieValue(
             tab.get(), url, wait_cookie_name,
             TestTimeouts::huge_test_timeout_ms(),
             wait_cookie_value);
         ASSERT_TRUE(completed);
       } else {
         result->cookie_value = WaitUntilCookieNonEmpty(
             tab.get(), url, wait_cookie_name,
             TestTimeouts::huge_test_timeout_ms());
         ASSERT_TRUE(result->cookie_value.length());
       }
     } else if (!wait_js_expr.empty()) {
-      bool completed = WaitUntilJavaScriptCondition(tab.get(),
-                                                    wait_js_frame_xpath,
-                                                    wait_js_expr,
-                                                    wait_js_timeout_ms);
+      bool completed = WaitUntilJavaScriptCondition(
+          tab.get(),
+          UTF8ToWide(wait_js_frame_xpath),
+          UTF8ToWide(wait_js_expr),
+          wait_js_timeout_ms);
       ASSERT_TRUE(completed);
     }
     if (var_to_fetch) {
       std::string script = StringPrintf(
           "window.domAutomationController.send(%s);", var_to_fetch);
 
       std::wstring value;
       bool success = tab->ExecuteAndExtractString(L"", ASCIIToWide(script),
                                                   &value);
       ASSERT_TRUE(success);
@@ skipping 52 matching lines @@
 TEST_F(UrlFetchTest, UrlFetch) {
   const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
 
   if (!cmd_line->HasSwitch("url"))
     return;
 
   std::string cookie_name =
       cmd_line->GetSwitchValueASCII("wait_cookie_name");
   std::string cookie_value =
       cmd_line->GetSwitchValueASCII("wait_cookie_value");
-  std::wstring js_expr =
-      UTF8ToWide(cmd_line->GetSwitchValueASCII("wait_js_expr"));
-  std::wstring js_frame_xpath =
-      UTF8ToWide(cmd_line->GetSwitchValueASCII("wait_js_frame_xpath"));
+  std::string js_expr =
+      cmd_line->GetSwitchValueASCII("wait_js_expr");
+  std::string js_frame_xpath =
+      cmd_line->GetSwitchValueASCII("wait_js_frame_xpath");
   std::string js_timeout_ms_str =
       cmd_line->GetSwitchValueASCII("wait_js_timeout");
 
   std::string jsvar = cmd_line->GetSwitchValueASCII("jsvar");
   int js_timeout_ms = -1; // no timeout, wait forever
 
   if (!js_timeout_ms_str.empty())
     base::StringToInt(js_timeout_ms_str, &js_timeout_ms);
 
   UrlFetchTestResult result;
@@ skipping 15 matching lines @@
 
   // Write out the JS Variable if requested
   FilePath jsvar_output_path = cmd_line->GetSwitchValuePath("jsvar_output");
   if (jsvar_output_path.value().size() > 0) {
     ASSERT_TRUE(WriteValueToFile(result.javascript_variable,
                                  jsvar_output_path));
   }
 }
 
 }  // namespace