Migrating the SSL UI tests to be browser tests.

Reenabling all of them.
Hopefully it'll help with flakiness.

Note that I am keeping the SSL UI tests alive until the browser test framework has been ported to Mac and Linux.

BUG=6584,2136
TEST=Run the browser tests.
Review URL: http://codereview.chromium.org/101013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14901 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 6 deletions

diff --git a/chrome/browser/views/find_bar_win_browsertest.cc b/chrome/browser/views/find_bar_win_browsertest.cc
index 4cca160..744560a 100644
--- a/chrome/browser/views/find_bar_win_browsertest.cc
+++ b/chrome/browser/views/find_bar_win_browsertest.cc
@@ -149,11 +149,13 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindInPageFrames) {
 }
 
 std::string FocusedOnPage(WebContents* web_contents) {
-  ui_test_utils::JavaScriptRunner js_runner(
+  std::string result;
+  ui_test_utils::ExecuteJavaScriptAndExtractString(
       web_contents,
       L"",
-      L"window.domAutomationController.send(getFocusedElement());");
-  return js_runner.Run();
+      L"window.domAutomationController.send(getFocusedElement());",
+      &result);
+  return result;
 }
 
 // This tests the FindInPage end-state, in other words: what is focused when you
@@ -186,11 +188,12 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindInPageEndState) {
   EXPECT_EQ(1, FindInPage(L"Google", FWD, IGNORE_CASE, false));
 
   // Move the selection to link 1, after searching.
-  ui_test_utils::JavaScriptRunner js_runner(
+  std::string result;
+  ui_test_utils::ExecuteJavaScriptAndExtractString(
       web_contents,
       L"",
-      L"window.domAutomationController.send(selectLink1());");
-  js_runner.Run();
+      L"window.domAutomationController.send(selectLink1());",
+      &result);
 
   // End the find session.
   web_contents->StopFinding(false);