chrome/browser/chromeos/login/test/oobe_base_test.cc - Issue 1536553002: Remove InlineLoginHandlerChromeOS and exclude InlineLoginUI from CrOS build.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/test/oobe_base_test.cc

Issue 1536553002: Remove InlineLoginHandlerChromeOS and exclude InlineLoginUI from CrOS build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Merge conflicts resolved. Created 4 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/login/saml/saml_browsertest.cc ('k') | chrome/browser/ui/views/profiles/signin_view_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/test/oobe_base_test.cc

diff --git a/chrome/browser/chromeos/login/test/oobe_base_test.cc b/chrome/browser/chromeos/login/test/oobe_base_test.cc

index 8f480f66d18a0ce37c9256c043bbda6b5be58bc1..5d5a5278d5e29daf932a66ab9713c5751b4346d0 100644

--- a/chrome/browser/chromeos/login/test/oobe_base_test.cc

+++ b/chrome/browser/chromeos/login/test/oobe_base_test.cc

@@ -15,7 +15,7 @@

#include "chrome/browser/chromeos/login/ui/webui_login_view.h"

#include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"

#include "chrome/browser/lifetime/application_lifetime.h"

-#include "chrome/browser/ui/webui/signin/inline_login_ui.h"

+#include "chrome/browser/ui/webui/signin/get_auth_frame.h"

#include "chrome/common/chrome_paths.h"

#include "chrome/common/chrome_switches.h"

#include "chromeos/chromeos_switches.h"

@@ -245,8 +245,8 @@ void OobeBaseTest::WaitForSigninScreen() {

}

void OobeBaseTest::ExecuteJsInSigninFrame(const std::string& js) {

- content::RenderFrameHost* frame = InlineLoginUI::GetAuthFrame(

- GetLoginUI()->GetWebContents(), GURL(), gaia_frame_parent_);

+ content::RenderFrameHost* frame =

+ signin::GetAuthFrame(GetLoginUI()->GetWebContents(), gaia_frame_parent_);

ASSERT_TRUE(content::ExecuteScript(frame, js));

}