Revert 174880 due to compilation error in pdf_browsertest.cc

chrome/browser/ui/panels/panel_browsertest.cc

Index: chrome/browser/ui/panels/panel_browsertest.cc
===================================================================
--- chrome/browser/ui/panels/panel_browsertest.cc	(revision 174946)
+++ chrome/browser/ui/panels/panel_browsertest.cc	(working copy)
@@ -425,8 +425,8 @@
   WaitForAutoResizeWider enlarge(panel);
   EXPECT_TRUE(content::ExecuteJavaScript(
       panel->GetWebContents()->GetRenderViewHost(),
-      "",
-      "changeSize(50);"));
+      std::wstring(),
+      L"changeSize(50);"));
   enlarge.Wait();
   gfx::Rect bounds_on_grow = panel->GetBounds();
   EXPECT_GT(bounds_on_grow.width(), initial_bounds.width());
@@ -436,8 +436,8 @@
   WaitForAutoResizeNarrower shrink(panel);
   EXPECT_TRUE(content::ExecuteJavaScript(
       panel->GetWebContents()->GetRenderViewHost(),
-      "",
-      "changeSize(-30);"));
+      std::wstring(),
+      L"changeSize(-30);"));
   shrink.Wait();
   gfx::Rect bounds_on_shrink = panel->GetBounds();
   EXPECT_LT(bounds_on_shrink.width(), bounds_on_grow.width());
@@ -1566,9 +1566,9 @@
   WaitForAutoResizeWider enlarge(panel);
   EXPECT_TRUE(content::ExecuteJavaScript(
       panel->GetWebContents()->GetRenderViewHost(),
-      "",
-      "document.body.innerHTML ="
-      "    '<nobr>line of text and a <button>Button</button>';"));
+      std::wstring(),
+      L"document.body.innerHTML ="
+      L"'<nobr>line of text and a <button>Button</button>';"));
   enlarge.Wait();
 
   // The panel should have become larger in both dimensions (the minimums
Property changes on: chrome/browser/ui/panels/panel_browsertest.cc
___________________________________________________________________
Deleted: svn:mergeinfo