Change ExecuteJavaScript* helper functions in browser_test_utils.{h,cc}

chrome/browser/geolocation/geolocation_browsertest.cc

 // Copyright (c) 2012 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 <string>
 
 #include "base/compiler_specific.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
@@ skipping 53 matching lines @@
     content::RunMessageLoop();
 
     EXPECT_EQ(base::StringPrintf("\"%d\"", iframe_id), javascript_response_);
     registrar_.RemoveAll();
     // Now that we loaded the iframe, let's fetch its src.
     script = base::StringPrintf(
         "window.domAutomationController.send(getIFrameSrc(%d))", iframe_id);
     std::string iframe_src;
     EXPECT_TRUE(content::ExecuteJavaScriptAndExtractString(
         chrome::GetActiveWebContents(browser)->GetRenderViewHost(),
-        L"", UTF8ToWide(script), &iframe_src));
+        "",
+        script,
+        &iframe_src));
     iframe_url_ = GURL(iframe_src);
   }
 
   GURL iframe_url() const { return iframe_url_; }
 
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) {
     if (type == content::NOTIFICATION_LOAD_STOP) {
       navigation_completed_ = true;
@@ skipping 42 matching lines @@
       registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
                      content::NotificationService::AllSources());
       registrar_.Add(this, content::NOTIFICATION_LOAD_START,
                      content::NotificationService::AllSources());
       registrar_.Add(this, content::NOTIFICATION_LOAD_STOP,
                      content::NotificationService::AllSources());
     }
   }
 
   void AddWatchAndWaitForNotification(content::RenderViewHost* render_view_host,
-                                      const std::wstring& iframe_xpath) {
+                                      const std::string& iframe_xpath) {
     LOG(WARNING) << "will add geolocation watch";
     std::string script =
         "window.domAutomationController.setAutomationId(0);"
         "window.domAutomationController.send(geoStart());";
-    render_view_host->ExecuteJavascriptInWebFrame(WideToUTF16Hack(iframe_xpath),
+    render_view_host->ExecuteJavascriptInWebFrame(UTF8ToUTF16(iframe_xpath),
                                                   UTF8ToUTF16(script));
     content::RunMessageLoop();
     registrar_.RemoveAll();
     LOG(WARNING) << "got geolocation watch" << javascript_response_;
     EXPECT_NE("\"0\"", javascript_response_);
     if (wait_for_infobar_) {
       EXPECT_TRUE(infobar_);
     } else {
       EXPECT_TRUE(navigation_completed_);
     }
@@ skipping 169 matching lines @@
   }
 
   void CheckStringValueFromJavascriptForTab(
       const std::string& expected, const std::string& function,
       WebContents* web_contents) {
     std::string script = base::StringPrintf(
         "window.domAutomationController.send(%s)", function.c_str());
     std::string result;
     ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
         web_contents->GetRenderViewHost(),
-        iframe_xpath_, UTF8ToWide(script), &result));
+        iframe_xpath_,
+        script,
+        &result));
     EXPECT_EQ(expected, result);
   }
 
   void CheckStringValueFromJavascript(
       const std::string& expected, const std::string& function) {
     CheckStringValueFromJavascriptForTab(
         expected, function, chrome::GetActiveWebContents(current_browser_));
   }
 
   void NotifyGeoposition(double latitude, double longitude) {
     fake_latitude_ = latitude;
     fake_longitude_ = longitude;
     ui_test_utils::OverrideGeolocation(latitude, longitude);
     LOG(WARNING) << "MockLocationProvider listeners updated";
   }
 
   InfoBarDelegate* infobar_;
   Browser* current_browser_;
   // path element of a URL referencing the html content for this test.
   std::string html_for_tests_;
   // This member defines the iframe (or top-level page, if empty) where the
   // javascript calls will run.
-  std::wstring iframe_xpath_;
+  std::string iframe_xpath_;
   // The current url for the top level page.
   GURL current_url_;
   // If not empty, the GURLs for the iframes loaded by LoadIFrames().
   std::vector<GURL> iframe_urls_;
   double fake_latitude_;
   double fake_longitude_;
 
   // TODO(phajdan.jr): Remove after we can ask TestServer whether it is started.
   bool started_test_server_;
 };
@@ skipping 89 matching lines @@
   CheckGeoposition(fake_latitude_, fake_longitude_);
 }
 
 IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest,
                        IFramesWithFreshPosition) {
   html_for_tests_ = "files/geolocation/iframes_different_origin.html";
   ASSERT_TRUE(Initialize(INITIALIZATION_IFRAMES));
   LoadIFrames(2);
   LOG(WARNING) << "frames loaded";
 
-  iframe_xpath_ = L"//iframe[@id='iframe_0']";
+  iframe_xpath_ = "//iframe[@id='iframe_0']";
   AddGeolocationWatch(true);
   SetInfobarResponse(iframe_urls_[0], true);
   CheckGeoposition(fake_latitude_, fake_longitude_);
   // Disables further prompts from this iframe.
   CheckStringValueFromJavascript("0", "geoSetMaxNavigateCount(0)");
 
   // Test second iframe from a different origin with a cached geoposition will
   // create the infobar.
-  iframe_xpath_ = L"//iframe[@id='iframe_1']";
+  iframe_xpath_ = "//iframe[@id='iframe_1']";
   AddGeolocationWatch(true);
 
   // Back to the first frame, enable navigation and refresh geoposition.
-  iframe_xpath_ = L"//iframe[@id='iframe_0']";
+  iframe_xpath_ = "//iframe[@id='iframe_0']";
   CheckStringValueFromJavascript("1", "geoSetMaxNavigateCount(1)");
   double fresh_position_latitude = 3.17;
   double fresh_position_longitude = 4.23;
   content::WindowedNotificationObserver observer(
       content::NOTIFICATION_LOAD_STOP,
       content::Source<NavigationController>(
           &chrome::GetActiveWebContents(current_browser_)->GetController()));
   NotifyGeoposition(fresh_position_latitude, fresh_position_longitude);
   observer.Wait();
   CheckGeoposition(fresh_position_latitude, fresh_position_longitude);
 
   // Disable navigation for this frame.
   CheckStringValueFromJavascript("0", "geoSetMaxNavigateCount(0)");
 
   // Now go ahead an authorize the second frame.
-  iframe_xpath_ = L"//iframe[@id='iframe_1']";
+  iframe_xpath_ = "//iframe[@id='iframe_1']";
   // Infobar was displayed, allow access and check there's no error code.
   SetInfobarResponse(iframe_urls_[1], true);
   LOG(WARNING) << "Checking position...";
   CheckGeoposition(fresh_position_latitude, fresh_position_longitude);
   LOG(WARNING) << "...done.";
 }
 
 IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest,
                        IFramesWithCachedPosition) {
   html_for_tests_ = "files/geolocation/iframes_different_origin.html";
   ASSERT_TRUE(Initialize(INITIALIZATION_IFRAMES));
   LoadIFrames(2);
 
-  iframe_xpath_ = L"//iframe[@id='iframe_0']";
+  iframe_xpath_ = "//iframe[@id='iframe_0']";
   AddGeolocationWatch(true);
   SetInfobarResponse(iframe_urls_[0], true);
   CheckGeoposition(fake_latitude_, fake_longitude_);
 
   // Refresh geoposition, but let's not yet create the watch on the second frame
   // so that it'll fetch from cache.
   double cached_position_latitude = 5.67;
   double cached_position_lognitude = 8.09;
   content::WindowedNotificationObserver observer(
       content::NOTIFICATION_LOAD_STOP,
       content::Source<NavigationController>(
           &chrome::GetActiveWebContents(current_browser_)->GetController()));
   NotifyGeoposition(cached_position_latitude, cached_position_lognitude);
   observer.Wait();
   CheckGeoposition(cached_position_latitude, cached_position_lognitude);
 
   // Disable navigation for this frame.
   CheckStringValueFromJavascript("0", "geoSetMaxNavigateCount(0)");
 
   // Now go ahead an authorize the second frame.
-  iframe_xpath_ = L"//iframe[@id='iframe_1']";
+  iframe_xpath_ = "//iframe[@id='iframe_1']";
   AddGeolocationWatch(true);
   // WebKit will use its cache, but we also broadcast a position shortly
   // afterwards. We're only interested in the first navigation for the success
   // callback from the cached position.
   CheckStringValueFromJavascript("1", "geoSetMaxNavigateCount(1)");
   SetInfobarResponse(iframe_urls_[1], true);
   CheckGeoposition(cached_position_latitude, cached_position_lognitude);
 }
 
 IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, CancelPermissionForFrame) {
   html_for_tests_ = "files/geolocation/iframes_different_origin.html";
   ASSERT_TRUE(Initialize(INITIALIZATION_IFRAMES));
   LoadIFrames(2);
   LOG(WARNING) << "frames loaded";
 
-  iframe_xpath_ = L"//iframe[@id='iframe_0']";
+  iframe_xpath_ = "//iframe[@id='iframe_0']";
   AddGeolocationWatch(true);
   SetInfobarResponse(iframe_urls_[0], true);
   CheckGeoposition(fake_latitude_, fake_longitude_);
   // Disables further prompts from this iframe.
   CheckStringValueFromJavascript("0", "geoSetMaxNavigateCount(0)");
 
   // Test second iframe from a different origin with a cached geoposition will
   // create the infobar.
-  iframe_xpath_ = L"//iframe[@id='iframe_1']";
+  iframe_xpath_ = "//iframe[@id='iframe_1']";
   AddGeolocationWatch(true);
 
   InfoBarService* infobar_service = InfoBarService::FromWebContents(
       chrome::GetActiveWebContents(current_browser_));
   size_t num_infobars_before_cancel = infobar_service->GetInfoBarCount();
   // Change the iframe, and ensure the infobar is gone.
   IFrameLoader change_iframe_1(current_browser_, 1, current_url_);
   size_t num_infobars_after_cancel = infobar_service->GetInfoBarCount();
   EXPECT_EQ(num_infobars_before_cancel, num_infobars_after_cancel + 1);
 }
@@ skipping 10 matching lines @@
 
 // Crashy, http://crbug.com/66400.
 IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, DISABLED_NoInfoBarBeforeStart) {
   // See http://crbug.com/42789
   html_for_tests_ = "files/geolocation/iframes_different_origin.html";
   ASSERT_TRUE(Initialize(INITIALIZATION_IFRAMES));
   LoadIFrames(2);
   LOG(WARNING) << "frames loaded";
 
   // Access navigator.geolocation, but ensure it won't request permission.
-  iframe_xpath_ = L"//iframe[@id='iframe_1']";
+  iframe_xpath_ = "//iframe[@id='iframe_1']";
   CheckStringValueFromJavascript("object", "geoAccessNavigatorGeolocation()");
 
-  iframe_xpath_ = L"//iframe[@id='iframe_0']";
+  iframe_xpath_ = "//iframe[@id='iframe_0']";
   AddGeolocationWatch(true);
   SetInfobarResponse(iframe_urls_[0], true);
   CheckGeoposition(fake_latitude_, fake_longitude_);
   CheckStringValueFromJavascript("0", "geoSetMaxNavigateCount(0)");
 
   // Permission should be requested after adding a watch.
-  iframe_xpath_ = L"//iframe[@id='iframe_1']";
+  iframe_xpath_ = "//iframe[@id='iframe_1']";
   AddGeolocationWatch(true);
   SetInfobarResponse(iframe_urls_[1], true);
   CheckGeoposition(fake_latitude_, fake_longitude_);
 }
 
 IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, TwoWatchesInOneFrame) {
   html_for_tests_ = "files/geolocation/two_watches.html";
   ASSERT_TRUE(Initialize(INITIALIZATION_NONE));
   // First, set the JavaScript to navigate when it receives |final_position|.
   double final_position_latitude = 3.17;
   double final_position_longitude = 4.23;
   std::string script = base::StringPrintf(
       "window.domAutomationController.send(geoSetFinalPosition(%f, %f))",
       final_position_latitude, final_position_longitude);
   std::string js_result;
   EXPECT_TRUE(content::ExecuteJavaScriptAndExtractString(
       chrome::GetActiveWebContents(current_browser_)->GetRenderViewHost(),
-      L"", UTF8ToWide(script), &js_result));
+      "",
+      script,
+      &js_result));
   EXPECT_EQ(js_result, "ok");
 
   // Send a position which both geolocation watches will receive.
   AddGeolocationWatch(true);
   SetInfobarResponse(current_url_, true);
   CheckGeoposition(fake_latitude_, fake_longitude_);
 
   // The second watch will now have cancelled. Ensure an update still makes
   // its way through to the first watcher.
   content::WindowedNotificationObserver observer(
       content::NOTIFICATION_LOAD_STOP,
       content::Source<NavigationController>(
           &chrome::GetActiveWebContents(current_browser_)->GetController()));
   NotifyGeoposition(final_position_latitude, final_position_longitude);
   observer.Wait();
   CheckGeoposition(final_position_latitude, final_position_longitude);
 }
 
 IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, TabDestroyed) {
   html_for_tests_ = "files/geolocation/tab_destroyed.html";
   ASSERT_TRUE(Initialize(INITIALIZATION_IFRAMES));
   LoadIFrames(3);
 
-  iframe_xpath_ = L"//iframe[@id='iframe_0']";
+  iframe_xpath_ = "//iframe[@id='iframe_0']";
   AddGeolocationWatch(true);
 
-  iframe_xpath_ = L"//iframe[@id='iframe_1']";
+  iframe_xpath_ = "//iframe[@id='iframe_1']";
   AddGeolocationWatch(false);
 
-  iframe_xpath_ = L"//iframe[@id='iframe_2']";
+  iframe_xpath_ = "//iframe[@id='iframe_2']";
   AddGeolocationWatch(false);
 
   std::string script =
-      "window.domAutomationController.setAutomationId(0);"
       "window.domAutomationController.send(window.close());";
   bool result =
       content::ExecuteJavaScript(
-      chrome::GetActiveWebContents(current_browser_)->GetRenderViewHost(),
-      L"", UTF8ToWide(script));
+          chrome::GetActiveWebContents(current_browser_)->GetRenderViewHost(),
+          "",
+          script);
   EXPECT_EQ(result, true);
 }
 
 }  // namespace