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

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

Issue 10823208: Reverting this as it causes browser tests on the Linux ChromiumOS builder to fail. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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/browser_process_impl.cc ('k') | chrome/browser/chromeos/login/login_utils_browsertest.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
===================================================================
--- chrome/browser/chromeos/login/login_utils.cc (revision 150390)
+++ chrome/browser/chromeos/login/login_utils.cc (working copy)
@@ -49,9 +49,6 @@
#include "chrome/browser/net/chrome_url_request_context.h"
#include "chrome/browser/net/preconnect.h"
#include "chrome/browser/policy/browser_policy_connector.h"
-#include "chrome/browser/policy/cloud_policy_client.h"
-#include "chrome/browser/policy/cloud_policy_service.h"
-#include "chrome/browser/policy/user_cloud_policy_manager.h"
#include "chrome/browser/prefs/pref_member.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
@@ -490,23 +487,6 @@
// initialization code sees the cached policy settings.
connector->InitializeUserPolicy(username, wait_for_policy_fetch);
- // The default profile will have been changed because the ProfileManager
- // will process the notification that the UserManager sends out.
- 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.
@@ -515,6 +495,11 @@
new PolicyOAuthFetcher(authenticator_->authentication_profile()));
policy_oauth_fetcher_->Start();
}
+
+ // The default profile will have been changed because the ProfileManager
+ // will process the notification that the UserManager sends out.
+ ProfileManager::CreateDefaultProfileAsync(
+ base::Bind(&LoginUtilsImpl::OnProfileCreated, AsWeakPtr()));
}
void LoginUtilsImpl::DelegateDeleted(LoginUtils::Delegate* delegate) {
« no previous file with comments | « chrome/browser/browser_process_impl.cc ('k') | chrome/browser/chromeos/login/login_utils_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698