Simplify ExecuteJavaScript* functions.

chrome/browser/extensions/subscribe_page_action_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 "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ skipping 59 matching lines @@
         extension_id + std::string(kSubscribePage) + std::string("?") +
         feed_url.spec() + std::string("&synchronous"));
   } else {
     // Navigate to the feed content (which will cause the extension to try to
     // sniff the type and display the subscribe page in another tab.
     return GURL(feed_url.spec());
   }
 }
 
 bool ValidatePageElement(WebContents* tab,
-                         const std::string& frame,
+                         const std::string& frame_xpath,
                          const std::string& javascript,
                          const std::string& expected_value) {
   std::string returned_value;
   std::string error;
 
-  if (!content::ExecuteJavaScriptAndExtractString(
-          tab->GetRenderViewHost(),
-          frame,
-          javascript,
-          &returned_value))
+  if (!content::ExecuteScriptInFrameAndExtractString(tab, frame_xpath,
+                                                     javascript,
+                                                     &returned_value))
     return false;
 
   EXPECT_STREQ(expected_value.c_str(), returned_value.c_str());
   return expected_value == returned_value;
 }
 
 // Navigates to a feed page and, if |sniff_xml_type| is set, wait for the
 // extension to kick in, detect the feed and redirect to a feed preview page.
 // |sniff_xml_type| is generally set to true if the feed is sniffable and false
 // for invalid feeds.
@@ skipping 241 matching lines @@
   std::string id = extension->id();
 
   // Valid feed but containing no links.
   NavigateToFeedAndValidate(
       test_server(), kValidFeedNoLinks, browser(), id, true,
       "Feed for MyFeedTitle",
       "Title with no link",
       "Desc",
       "No error");
 }