Add ExecuteJavaScriptForTest and make all tests use it

chrome/browser/mouseleave_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/files/file_path.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h"
 #include "chrome/browser/renderer_context_menu/render_view_context_menu_browsertest_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
@@ skipping 112 matching lines @@
   content::WebContents* tab =
       browser()->tab_strip_model()->GetActiveWebContents();
 
   EXPECT_NO_FATAL_FAILURE(LoadTestPageAndWaitForMouseOver(tab));
 
   ContextMenuWaiter menu_observer(content::NotificationService::AllSources());
   ui_controls::SendMouseClick(ui_controls::RIGHT);
   // Wait until the context menu is opened and closed.
   menu_observer.WaitForMenuOpenAndClose();
 
-  tab->GetMainFrame()->ExecuteJavaScript(base::ASCIIToUTF16("done()"));
+  tab->GetMainFrame()->ExecuteJavaScriptForTests(base::ASCIIToUTF16("done()"));
   const base::string16 success_title = base::ASCIIToUTF16("without mouseleave");
   const base::string16 failure_title = base::ASCIIToUTF16("with mouseleave");
   content::TitleWatcher done_title_watcher(tab, success_title);
   done_title_watcher.AlsoWaitForTitle(failure_title);
 
   EXPECT_EQ(success_title, done_title_watcher.WaitAndGetTitle());
 }
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
 // Test that a mouseleave is not triggered when showing a modal dialog.
 // Sample regression: crbug.com/394672
 // TODO: Make test pass on OS_WIN and OS_MACOSX
 // OS_WIN: http://crbug.com/450138
 // OS_MACOSX: Missing automation provider support: http://crbug.com/45892.
 #define MAYBE_ModalDialog DISABLED_ModalDialog
 #else
 #define MAYBE_ModalDialog ModalDialog
 #endif
 
 IN_PROC_BROWSER_TEST_F(MouseLeaveTest, MAYBE_ModalDialog) {
   content::WebContents* tab =
       browser()->tab_strip_model()->GetActiveWebContents();
 
   EXPECT_NO_FATAL_FAILURE(LoadTestPageAndWaitForMouseOver(tab));
 
-  tab->GetMainFrame()->ExecuteJavaScript(base::UTF8ToUTF16("alert()"));
+  tab->GetMainFrame()->ExecuteJavaScriptForTests(base::UTF8ToUTF16("alert()"));
   app_modal::AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog();
   // Cancel the dialog.
   alert->CloseModalDialog();
 
-  tab->GetMainFrame()->ExecuteJavaScript(base::ASCIIToUTF16("done()"));
+  tab->GetMainFrame()->ExecuteJavaScriptForTests(base::ASCIIToUTF16("done()"));
   const base::string16 success_title = base::ASCIIToUTF16("without mouseleave");
   const base::string16 failure_title = base::ASCIIToUTF16("with mouseleave");
   content::TitleWatcher done_title_watcher(tab, success_title);
   done_title_watcher.AlsoWaitForTitle(failure_title);
   EXPECT_EQ(success_title, done_title_watcher.WaitAndGetTitle());
 }
 
 }  // namespace