Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4131)

Unified Diff: chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc

Issue 1108983002: Fetch policy with refresh token. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix user_cloud_policy_manager_chromeos_unittest 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
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..b09323077b23415100e468461400559d80ba00c6 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
@@ -15,7 +15,6 @@
#include "base/threading/sequenced_worker_pool.h"
#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/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"
@@ -149,10 +148,8 @@ scoped_ptr<UserCloudPolicyManagerChromeOS>
const bool is_affiliated_user = affiliation == USER_AFFILIATION_MANAGED;
const bool is_browser_restart =
command_line->HasSwitch(chromeos::switches::kLoginUser);
- // 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() &&
(user_manager::UserManager::Get()->IsCurrentUserNew() ||
is_affiliated_user);
@@ -204,14 +201,11 @@ scoped_ptr<UserCloudPolicyManagerChromeOS>
content::BrowserThread::FILE);
scoped_ptr<UserCloudPolicyManagerChromeOS> manager(
- new UserCloudPolicyManagerChromeOS(store.Pass(),
- external_data_manager.Pass(),
- component_policy_cache_dir,
- wait_for_initial_policy,
- initial_policy_fetch_timeout,
- base::MessageLoopProxy::current(),
- file_task_runner,
- io_task_runner));
+ new UserCloudPolicyManagerChromeOS(
+ store.Pass(), external_data_manager.Pass(),
+ component_policy_cache_dir, wait_for_initial_policy,
+ initial_policy_fetch_timeout, base::MessageLoopProxy::current(),
+ file_task_runner, io_task_runner));
bool wildcard_match = false;
if (connector->IsEnterpriseManaged() &&

Powered by Google App Engine
This is Rietveld 408576698