| Index: chrome/browser/ui/webui/signin/login_ui_test_utils.cc
|
| diff --git a/chrome/browser/ui/webui/signin/login_ui_test_utils.cc b/chrome/browser/ui/webui/signin/login_ui_test_utils.cc
|
| index 6d01cf96b32b37a366256aceb69d88b72ae92578..8ee2c5cc57eb307e8fa0e99a8677902b6a3011c5 100644
|
| --- a/chrome/browser/ui/webui/signin/login_ui_test_utils.cc
|
| +++ b/chrome/browser/ui/webui/signin/login_ui_test_utils.cc
|
| @@ -6,7 +6,7 @@
|
| #include "chrome/browser/signin/signin_tracker_factory.h"
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/tabs/tab_strip_model.h"
|
| -#include "chrome/browser/ui/webui/signin/inline_login_ui.h"
|
| +#include "chrome/browser/ui/webui/signin/get_auth_frame.h"
|
| #include "chrome/test/base/ui_test_utils.h"
|
| #include "content/public/browser/notification_service.h"
|
| #include "content/public/browser/notification_types.h"
|
| @@ -139,8 +139,7 @@ void WaitUntilElementExistsInSigninFrame(Browser* browser,
|
| content::WebContents* web_contents =
|
| browser->tab_strip_model()->GetActiveWebContents();
|
| ASSERT_TRUE(content::ExecuteScriptAndExtractString(
|
| - InlineLoginUI::GetAuthFrame(web_contents, GURL(), "signin-frame"),
|
| - js, &message));
|
| + signin::GetAuthFrame(web_contents, "signin-frame"), js, &message));
|
|
|
| ASSERT_EQ("found", message) <<
|
| "Failed to find element with id " << element_id;
|
| @@ -152,9 +151,10 @@ bool ElementExistsInSigninFrame(Browser* browser,
|
| browser->tab_strip_model()->GetActiveWebContents();
|
| bool result = false;
|
| EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
|
| - InlineLoginUI::GetAuthFrame(web_contents, GURL(), "signin-frame"),
|
| + signin::GetAuthFrame(web_contents, "signin-frame"),
|
| "window.domAutomationController.send("
|
| - " document.getElementById('" + element_id + "') != null);",
|
| + " document.getElementById('" +
|
| + element_id + "') != null);",
|
| &result));
|
| return result;
|
| }
|
| @@ -167,15 +167,15 @@ void SigninInNewGaiaFlow(Browser* browser,
|
|
|
| content::WebContents* web_contents =
|
| browser->tab_strip_model()->GetActiveWebContents();
|
| - ASSERT_TRUE(content::ExecuteScript(InlineLoginUI::GetAuthFrame(
|
| - web_contents, GURL(), "signin-frame"), js));
|
| + ASSERT_TRUE(content::ExecuteScript(
|
| + signin::GetAuthFrame(web_contents, "signin-frame"), js));
|
|
|
| WaitUntilElementExistsInSigninFrame(browser, "Passwd");
|
| js = "document.getElementById('Passwd').value = '" + password + "';"
|
| "document.getElementById('signIn').click();";
|
|
|
| - ASSERT_TRUE(content::ExecuteScript(InlineLoginUI::GetAuthFrame(
|
| - web_contents, GURL(), "signin-frame"), js));
|
| + ASSERT_TRUE(content::ExecuteScript(
|
| + signin::GetAuthFrame(web_contents, "signin-frame"), js));
|
| }
|
|
|
| void SigninInOldGaiaFlow(Browser* browser,
|
| @@ -188,8 +188,8 @@ void SigninInOldGaiaFlow(Browser* browser,
|
|
|
| content::WebContents* web_contents =
|
| browser->tab_strip_model()->GetActiveWebContents();
|
| - ASSERT_TRUE(content::ExecuteScript(InlineLoginUI::GetAuthFrame(
|
| - web_contents, GURL(), "signin-frame"), js));
|
| + ASSERT_TRUE(content::ExecuteScript(
|
| + signin::GetAuthFrame(web_contents, "signin-frame"), js));
|
| }
|
|
|
| void ExecuteJsToSigninInSigninFrame(Browser* browser,
|
|
|