chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc - Issue 1107873002: Test BlockingLoginTestInstance with enabled webview

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/policy/user_cloud_policy_manager_factory_chromeos.cc

Issue 1107873002: Test BlockingLoginTestInstance with enabled webview (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: tests fixed Created 5 years, 8 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

« chrome/browser/chromeos/login/session/user_session_manager.h ('K') | « chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc ('k') | chromeos/login/auth/auth_status_consumer.h » ('j') | chromeos/login/auth/auth_status_consumer.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc

diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc

index 9b56692b8e30945f987b45426353b6c8b884f622..e53389d1e7667d8a45e069d0683de0192db91434 100644

--- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc

+++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc

@@ -16,6 +16,7 @@

#include "base/time/time.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chromeos/login/session/user_session_manager.h"

+#include "chrome/browser/chromeos/login/startup_utils.h"

#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"

#include "chrome/browser/chromeos/policy/user_cloud_external_data_manager.h"

#include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"

@@ -152,7 +153,8 @@ scoped_ptr<UserCloudPolicyManagerChromeOS>

// TODO(xiyuan): Update the code below after http://crbug.com/462036.

const bool wait_for_initial_policy =

!is_browser_restart &&

- chromeos::UserSessionManager::GetInstance()->has_auth_cookies() &&

+ (chromeos::UserSessionManager::GetInstance()->has_auth_cookies() ||

+ chromeos::StartupUtils::IsWebviewSigninEnabled()) &&

(user_manager::UserManager::Get()->IsCurrentUserNew() ||

is_affiliated_user);