Simplify ExecuteJavaScript* functions.

chrome/browser/notifications/notification_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 <deque>
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
@@ skipping 254 matching lines @@
     const char* icon,
     const char* title,
     const char* body,
     const char* replace_id) {
   std::string script = base::StringPrintf(
       "createNotification('%s', '%s', '%s', '%s');",
       icon, title, body, replace_id);
 
   NotificationBalloonChangeObserver observer;
   std::string result;
-  bool success = content::ExecuteJavaScriptAndExtractString(
-      browser->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(),
-      "",
+  bool success = content::ExecuteScriptAndExtractString(
+      browser->tab_strip_model()->GetActiveWebContents(),
       script,
       &result);
   if (success && result != "-1" && wait_for_new_balloon)
     success = observer.Wait();
   EXPECT_TRUE(success);
 
   return result;
 }
 
 std::string NotificationsTest::CreateSimpleNotification(
     Browser* browser,
     bool wait_for_new_balloon) {
   return CreateNotification(
       browser, wait_for_new_balloon,
       "no_such_file.png", "My Title", "My Body", "");
 }
 
 bool NotificationsTest::RequestPermissionAndWait(Browser* browser) {
   InfoBarService* infobar_service = InfoBarService::FromWebContents(
       browser->tab_strip_model()->GetActiveWebContents());
   content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED,
       content::Source<InfoBarService>(infobar_service));
   std::string result;
-  bool success = content::ExecuteJavaScriptAndExtractString(
-      browser->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(),
-      "",
+  bool success = content::ExecuteScriptAndExtractString(
+      browser->tab_strip_model()->GetActiveWebContents(),
       "requestPermission();",
       &result);
   if (!success || result != "1")
     return false;
   observer.Wait();
   return true;
 }
 
 bool NotificationsTest::CancelNotification(
     const char* notification_id,
     Browser* browser) {
   std::string script = base::StringPrintf(
       "cancelNotification('%s');",
       notification_id);
 
   NotificationBalloonChangeObserver observer;
   std::string result;
-  bool success = content::ExecuteJavaScriptAndExtractString(
-      browser->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(),
-      "",
+  bool success = content::ExecuteScriptAndExtractString(
+      browser->tab_strip_model()->GetActiveWebContents(),
       script,
       &result);
   if (!success || result != "1")
     return false;
   return observer.Wait();
 }
 
 bool NotificationsTest::PerformActionOnInfobar(
     Browser* browser,
     InfobarAction action,
@@ skipping 70 matching lines @@
 // If this flakes, use http://crbug.com/62311 and http://crbug.com/74428.
 IN_PROC_BROWSER_TEST_F(NotificationsTest, TestUserGestureInfobar) {
   ui_test_utils::NavigateToURL(
       browser(),
       test_server()->GetURL(
           "files/notifications/notifications_request_function.html"));
 
   // Request permission by calling request() while eval'ing an inline script;
   // That's considered a user gesture to webkit, and should produce an infobar.
   bool result;
-  ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
-      browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(),
-      "",
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+      browser()->tab_strip_model()->GetActiveWebContents(),
       "window.domAutomationController.send(request());",
       &result));
   EXPECT_TRUE(result);
 
   EXPECT_EQ(1U, InfoBarService::FromWebContents(
       browser()->tab_strip_model()->GetWebContentsAt(0))->GetInfoBarCount());
 }
 
 // If this flakes, use http://crbug.com/62311.
 IN_PROC_BROWSER_TEST_F(NotificationsTest, TestNoUserGestureInfobar) {
@@ skipping 357 matching lines @@
   const std::deque<Balloon*>& balloons = GetActiveBalloons();
   EXPECT_EQ(1U, balloons.size());
   const Notification& notification = balloons[0]->notification();
   GURL EXPECTED_ICON_URL = test_server()->GetURL(kExpectedIconUrl);
   EXPECT_EQ(EXPECTED_ICON_URL, notification.icon_url());
   EXPECT_EQ(ASCIIToUTF16("Title2"), notification.title());
   EXPECT_EQ(ASCIIToUTF16("Body2"), notification.body());
 }
 
 #endif  // !defined(OS_CHROMEOS)