Simplify ExecuteJavaScript* functions.

chrome/browser/do_not_track_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/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
@@ skipping 47 matching lines @@
 
 // Check that the DOM property is set when the corresponding preference is set.
 IN_PROC_BROWSER_TEST_F(DoNotTrackTest, DOMProperty) {
   PrefService* prefs = browser()->profile()->GetPrefs();
   prefs->SetBoolean(prefs::kEnableDoNotTrack, true);
 
   ASSERT_NO_FATAL_FAILURE(content::WaitForLoadStop(
       chrome::GetActiveWebContents(browser())));
 
   std::string do_not_track;
-  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(content::ExecuteScriptAndExtractString(
+      chrome::GetActiveWebContents(browser()),
       "window.domAutomationController.send(navigator.doNotTrack)",
       &do_not_track));
   EXPECT_EQ("1", do_not_track);
 
   // Reset flag and check that the changed value is propagated to the existing
   // renderer.
   prefs->SetBoolean(prefs::kEnableDoNotTrack, false);
 
-  EXPECT_TRUE(content::ExecuteJavaScriptAndExtractString(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
-      "",
+  EXPECT_TRUE(content::ExecuteScriptAndExtractString(
+      chrome::GetActiveWebContents(browser()),
       "window.domAutomationController.send("
       "    navigator.doNotTrack === null ? '0' : '1')",
       &do_not_track));
   EXPECT_EQ("0", do_not_track);
 }