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

chrome/test/gpu/gpu_pixel_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 "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 160 matching lines @@
 
     content::DOMMessageQueue message_queue;
     ui_test_utils::NavigateToURL(browser(), net::FilePathToFileURL(url));
 
     // Wait for notification that page is loaded.
     ASSERT_TRUE(message_queue.WaitForMessage(NULL));
     message_queue.ClearQueue();
 
     gfx::Rect new_bounds = GetNewTabContainerBounds(tab_container_size);
 
-    std::wostringstream js_call;
+    std::ostringstream js_call;
     js_call << "preCallResizeInChromium(";
     js_call << new_bounds.width() << ", " << new_bounds.height();
     js_call << ");";
 
     ASSERT_TRUE(content::ExecuteJavaScript(
         chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-        L"", js_call.str()));
+        "",
+        js_call.str()));
 
     std::string message;
     ASSERT_TRUE(message_queue.WaitForMessage(&message));
     message_queue.ClearQueue();
     browser()->window()->SetBounds(new_bounds);
 
     // Wait for message from test page indicating the rendering is done.
     while (message.compare("\"resized\"")) {
       ASSERT_TRUE(message_queue.WaitForMessage(&message));
       message_queue.ClearQueue();
@@ skipping 392 matching lines @@
     {160, 100, 0, 0, 0}
   };
   const size_t ref_pixel_count = sizeof(ref_pixels) / sizeof(ReferencePixel);
 
   gfx::Size container_size(400, 300);
   FilePath url =
       test_data_dir().AppendASCII("pixel_canvas2d.html");
   RunPixelTest(container_size, url, ref_img_revision_update,
                ref_pixels, ref_pixel_count);
 }