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, 8 insertions, 6 deletions

diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc
index 4d46a59..c9f8052 100644
--- a/chrome/browser/browser_focus_uitest.cc
+++ b/chrome/browser/browser_focus_uitest.cc
@@ -264,11 +264,12 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FocusTraversal) {
     // Now let's press tab to move the focus.
     for (int j = 0; j < 7; ++j) {
       // Let's make sure the focus is on the expected element in the page.
-      ui_test_utils::JavaScriptRunner js_runner(
+      std::string actual;
+      ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(
           browser()->GetSelectedTabContents()->AsWebContents(),
           L"",
-          L"window.domAutomationController.send(getFocusedElement());");
-      std::string actual = js_runner.Run();
+          L"window.domAutomationController.send(getFocusedElement());",
+          &actual));
       ASSERT_STREQ(kExpElementIDs[j], actual.c_str());
 
       ui_controls::SendKeyPressNotifyWhenDone(L'\t', false, false, false,
@@ -300,11 +301,12 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FocusTraversal) {
       ::Sleep(kActionDelayMs);
 
       // Let's make sure the focus is on the expected element in the page.
-      ui_test_utils::JavaScriptRunner js_runner(
+      std::string actual;
+      ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(
           browser()->GetSelectedTabContents()->AsWebContents(),
           L"",
-          L"window.domAutomationController.send(getFocusedElement());");
-      std::string actual = js_runner.Run();
+          L"window.domAutomationController.send(getFocusedElement());",
+          &actual));
       ASSERT_STREQ(kExpElementIDs[6 - j], actual.c_str());
     }