Simplify ExecuteJavaScript* functions.

chrome/browser/extensions/subscribe_page_action_browsertest.cc

Index: chrome/browser/extensions/subscribe_page_action_browsertest.cc
diff --git a/chrome/browser/extensions/subscribe_page_action_browsertest.cc b/chrome/browser/extensions/subscribe_page_action_browsertest.cc
index a1f6204fcbfa90b89333400c672f6dc82ace8e62..2c21944e595d3c2b453469d79eb70bfc7d6672ad 100644
--- a/chrome/browser/extensions/subscribe_page_action_browsertest.cc
+++ b/chrome/browser/extensions/subscribe_page_action_browsertest.cc
@@ -77,17 +77,15 @@ GURL GetFeedUrl(net::TestServer* server, const std::string& feed_page,
 }
 
 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());