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

Unified Diff: chrome/browser/chromeos/login/login_utils.cc

Issue 11415094: Split UserCloudPolicyManager implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix DeviceCloudPolicyManagerChromeOSTest.EnrolledDevice failure. Created 8 years, 1 month 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 | « no previous file | chrome/browser/chromeos/login/policy_oauth_fetcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/login_utils.cc
diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc
index ae8d4daa1527955be241aca47b8967875c618111..635dc8fe7996fdafbb21ba1767c24edec82d6c2f 100644
--- a/chrome/browser/chromeos/login/login_utils.cc
+++ b/chrome/browser/chromeos/login/login_utils.cc
@@ -53,7 +53,6 @@
#include "chrome/browser/policy/cloud_policy_client.h"
#include "chrome/browser/policy/cloud_policy_service.h"
#include "chrome/browser/policy/network_configuration_updater.h"
-#include "chrome/browser/policy/user_cloud_policy_manager.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
@@ -500,18 +499,6 @@ void LoginUtilsImpl::PrepareProfile(
ProfileManager::CreateDefaultProfileAsync(
base::Bind(&LoginUtilsImpl::OnProfileCreated, AsWeakPtr()));
- // The default profile is only partially initialized at this point.
- // Setup the UserCloudPolicyManager so profile initialization can complete.
- Profile* user_profile = ProfileManager::GetDefaultProfile();
-
- // Initialize the new cloud policy framework, if enabled.
- if (user_profile->GetUserCloudPolicyManager()) {
- user_profile->GetUserCloudPolicyManager()->Initialize(
- g_browser_process->local_state(),
- connector->device_management_service(),
- connector->GetUserAffiliation(username));
- }
-
if (wait_for_policy_fetch) {
// Profile creation will block until user policy is fetched, which
// requires the DeviceManagement token. Try to fetch it now.
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/policy_oauth_fetcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698