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

chrome/browser/policy/policy_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 <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 215 matching lines @@
   content::WebContents* contents = chrome::GetActiveWebContents(browser);
   EXPECT_EQ(url, contents->GetURL());
   string16 title = UTF8ToUTF16(url.spec() + " is not available");
   EXPECT_EQ(title, contents->GetTitle());
 
   // Verify that the expected error page is being displayed.
   // (error 138 == NETWORK_ACCESS_DENIED)
   bool result = false;
   EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       contents->GetRenderViewHost(),
-      std::wstring(),
-      L"var hasError = false;"
-      L"var error = document.getElementById('errorDetails');"
-      L"if (error)"
-      L"  hasError = error.textContent.indexOf('Error 138') == 0;"
-      L"domAutomationController.send(hasError);",
+      "",
+      "var hasError = false;"
+      "var error = document.getElementById('errorDetails');"
+      "if (error)"
+      "  hasError = error.textContent.indexOf('Error 138') == 0;"
+      "domAutomationController.send(hasError);",
       &result));
   EXPECT_TRUE(result);
 }
 
 // Downloads a file named |file| and expects it to be saved to |dir|, which
 // must be empty.
 void DownloadAndVerifyFile(
     Browser* browser, const FilePath& dir, const FilePath& file) {
   content::DownloadManager* download_manager =
       content::BrowserContext::GetDownloadManager(browser->profile());
@@ skipping 28 matching lines @@
     count++;
   return count;
 }
 #endif
 
 // Checks if WebGL is enabled in the given WebContents.
 bool IsWebGLEnabled(content::WebContents* contents) {
   bool result = false;
   EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       contents->GetRenderViewHost(),
-      std::wstring(),
-      L"var canvas = document.createElement('canvas');"
-      L"var context = canvas.getContext('experimental-webgl');"
-      L"domAutomationController.send(context != null);",
+      "",
+      "var canvas = document.createElement('canvas');"
+      "var context = canvas.getContext('experimental-webgl');"
+      "domAutomationController.send(context != null);",
       &result));
   return result;
 }
 
 bool IsJavascriptEnabled(content::WebContents* contents) {
   content::RenderViewHost* rvh = contents->GetRenderViewHost();
   scoped_ptr<base::Value> value(rvh->ExecuteJavascriptAndGetValue(
       string16(),
       ASCIIToUTF16("123")));
   int result = 0;
@@ skipping 147 matching lines @@
 
     // Wait for feedback page to fully initialize.
     // setupCurrentScreenshot is called when feedback page loads and (among
     // other things) adds current-screenshots-thumbnailDiv-0-image element.
     // The code below executes either before setupCurrentScreenshot was called
     // (setupCurrentScreenshot is replaced with our hook) or after it has
     // completed (in that case send result immediately).
     bool result = false;
     EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(
         web_contents->GetRenderViewHost(),
-        std::wstring(),
-        L"function btest_initCompleted(url) {"
-        L"  var img = new Image();"
-        L"  img.src = url;"
-        L"  img.onload = function() {"
-        L"    domAutomationController.send(img.width * img.height > 0);"
-        L"  };"
-        L"  img.onerror = function() {"
-        L"    domAutomationController.send(false);"
-        L"  };"
-        L"}"
-        L"function setupCurrentScreenshot(url) {"
-        L"  btest_initCompleted(url);"
-        L"}"
-        L"var img = document.getElementById("
-        L"    'current-screenshots-thumbnailDiv-0-image');"
-        L"if (img)"
-        L"  btest_initCompleted(img.src);",
+        "",
+        "function btest_initCompleted(url) {"
+        "  var img = new Image();"
+        "  img.src = url;"
+        "  img.onload = function() {"
+        "    domAutomationController.send(img.width * img.height > 0);"
+        "  };"
+        "  img.onerror = function() {"
+        "    domAutomationController.send(false);"
+        "  };"
+        "}"
+        "function setupCurrentScreenshot(url) {"
+        "  btest_initCompleted(url);"
+        "}"
+        "var img = document.getElementById("
+        "    'current-screenshots-thumbnailDiv-0-image');"
+        "if (img)"
+        "  btest_initCompleted(img.src);",
         &result));
     EXPECT_EQ(enabled, result);
 
     // Feedback page is a singleton page, so close so future calls to this
     // function work as expected.
     web_contents->Close();
   }
 
 #if defined(OS_CHROMEOS)
   void TestScreenshotFile(bool enabled) {
@@ skipping 1217 matching lines @@
   content::RunAllPendingInMessageLoop();
 
   GURL kAboutHistograms = GURL(std::string(chrome::kAboutScheme) +
                                std::string(content::kStandardSchemeSeparator) +
                                std::string(chrome::kChromeUIHistogramHost));
   ui_test_utils::NavigateToURL(browser(), kAboutHistograms);
   content::WebContents* contents = chrome::GetActiveWebContents(browser());
   std::string text;
   ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
       contents->GetRenderViewHost(),
-      std::wstring(),
-      L"var nodes = document.querySelectorAll('body > pre');"
-      L"var result = '';"
-      L"for (var i = 0; i < nodes.length; ++i) {"
-      L"  var text = nodes[i].innerHTML;"
-      L"  if (text.indexOf('Histogram: Enterprise.Policies') === 0) {"
-      L"    result = text;"
-      L"    break;"
-      L"  }"
-      L"}"
-      L"domAutomationController.send(result);",
+      "",
+      "var nodes = document.querySelectorAll('body > pre');"
+      "var result = '';"
+      "for (var i = 0; i < nodes.length; ++i) {"
+      "  var text = nodes[i].innerHTML;"
+      "  if (text.indexOf('Histogram: Enterprise.Policies') === 0) {"
+      "    result = text;"
+      "    break;"
+      "  }"
+      "}"
+      "domAutomationController.send(result);",
       &text));
   ASSERT_FALSE(text.empty());
   const std::string kExpectedLabel =
       "Histogram: Enterprise.Policies recorded 3 samples";
   EXPECT_EQ(kExpectedLabel, text.substr(0, kExpectedLabel.size()));
   // HomepageLocation has policy ID 1.
   EXPECT_NE(std::string::npos, text.find("<br>1   ---"));
   // ShowHomeButton has policy ID 35.
   EXPECT_NE(std::string::npos, text.find("<br>35  ---"));
   // BookmarkBarEnabled has policy ID 82.
   EXPECT_NE(std::string::npos, text.find("<br>82  ---"));
 }
 
 }  // namespace policy