Revert 174880 due to compilation error in pdf_browsertest.cc

chrome/test/base/ui_test_utils.cc

Index: chrome/test/base/ui_test_utils.cc
===================================================================
--- chrome/test/base/ui_test_utils.cc	(revision 174946)
+++ chrome/test/base/ui_test_utils.cc	(working copy)
@@ -564,11 +564,11 @@
 
   bool TakeEntirePageSnapshot(RenderViewHost* rvh,
                               SkBitmap* bitmap) WARN_UNUSED_RESULT {
-    const char* script =
-        "window.domAutomationController.send("
-            "JSON.stringify([document.width, document.height]))";
+    const wchar_t* script =
+        L"window.domAutomationController.send("
+        L"    JSON.stringify([document.width, document.height]))";
     std::string json;
-    if (!content::ExecuteJavaScriptAndExtractString(rvh, "", script, &json))
+    if (!content::ExecuteJavaScriptAndExtractString(rvh, L"", script, &json))
       return false;
 
     // Parse the JSON.
Property changes on: chrome/test/base/ui_test_utils.cc
___________________________________________________________________
Deleted: svn:mergeinfo