Simplify ExecuteJavaScript* functions.

chrome/browser/ui/panels/panel_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/bind.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/net/url_request_mock_util.h"
@@ skipping 405 matching lines @@
   Panel* panel = CreatePanelWithParams(params);
 
   // Ensure panel has auto resized to original web content size.
   // The resize will update the docked panel collection.
   WaitForStableInitialSize initial_resize(panel);
   initial_resize.Wait();
   gfx::Rect initial_bounds = panel->GetBounds();
 
   // Expand the test page. The resize will update the docked panel collection.
   WaitForAutoResizeWider enlarge(panel);
-  EXPECT_TRUE(content::ExecuteJavaScript(
-      panel->GetWebContents()->GetRenderViewHost(),
-      "",
-      "changeSize(50);"));
+  EXPECT_TRUE(content::ExecuteScript(
+      panel->GetWebContents(), "changeSize(50);"));
   enlarge.Wait();
   gfx::Rect bounds_on_grow = panel->GetBounds();
   EXPECT_GT(bounds_on_grow.width(), initial_bounds.width());
   EXPECT_EQ(bounds_on_grow.height(), initial_bounds.height());
 
   // Shrink the test page. The resize will update the docked panel collection.
   WaitForAutoResizeNarrower shrink(panel);
-  EXPECT_TRUE(content::ExecuteJavaScript(
-      panel->GetWebContents()->GetRenderViewHost(),
-      "",
-      "changeSize(-30);"));
+  EXPECT_TRUE(content::ExecuteScript(
+      panel->GetWebContents(), "changeSize(-30);"));
   shrink.Wait();
   gfx::Rect bounds_on_shrink = panel->GetBounds();
   EXPECT_LT(bounds_on_shrink.width(), bounds_on_grow.width());
   EXPECT_GT(bounds_on_shrink.width(), initial_bounds.width());
   EXPECT_EQ(bounds_on_shrink.height(), initial_bounds.height());
 
   // Verify resizing turns off auto-resizing and panel no longer auto-resizes.
   gfx::Rect previous_bounds = panel->GetBounds();
   // These should be identical because the panel is expanded.
   EXPECT_EQ(previous_bounds.size(), panel->GetRestoredBounds().size());
@@ skipping 1106 matching lines @@
 
   // Ensure panel has auto resized to original web content size.
   WaitForStableInitialSize initial_resize(panel);
   initial_resize.Wait();
 
   int initial_width = panel->GetBounds().width();
   int initial_height = panel->GetBounds().height();
 
   // Inject some HTML content into the panel.
   WaitForAutoResizeWider enlarge(panel);
-  EXPECT_TRUE(content::ExecuteJavaScript(
-      panel->GetWebContents()->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(content::ExecuteScript(
+      panel->GetWebContents(),
       "document.body.innerHTML ="
       "    '<nobr>line of text and a <button>Button</button>';"));
   enlarge.Wait();
 
   // The panel should have become larger in both dimensions (the minimums
   // has to be set to be smaller then a simple 1-line content, so the autosize
   // can work correctly.
   EXPECT_GT(panel->GetBounds().width(), initial_width);
   EXPECT_GT(panel->GetBounds().height(), initial_height);
 
@@ skipping 178 matching lines @@
 #else
 #define MAYBE_FocusChangeEventOnMinimize FocusChangeEventOnMinimize
 #endif
 IN_PROC_BROWSER_TEST_F(PanelExtensionApiTest,
                        MAYBE_FocusChangeEventOnMinimize) {
   // This is needed so the subsequently created panels can be activated.
   // On a Mac, it transforms background-only test process into foreground one.
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
   ASSERT_TRUE(RunExtensionTest("panels/focus_change_on_minimize")) << message_;
 }