Relanding this as this did not fix the chromiumos breakage.

chrome/browser/chromeos/login/policy_oauth_fetcher.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/policy_oauth_fetcher.h"
 
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
+#include "chrome/browser/policy/user_cloud_policy_manager.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 
 namespace chromeos {
 
 namespace {
 const char kServiceScopeChromeOSDeviceManagement[] =
     "https://www.googleapis.com/auth/chromeosdevicemanagement";
 }  // namespace
 
@@ skipping 66 matching lines @@
     const std::string& service_name,
     const GoogleServiceAuthError& error) {
   LOG(WARNING) << "Failed to get OAuth access token for " << service_name
                << ", error: " << error.state();
   SetPolicyToken("");
 }
 
 void PolicyOAuthFetcher::SetPolicyToken(const std::string& token) {
   policy_token_ = token;
   g_browser_process->browser_policy_connector()->RegisterForUserPolicy(token);
+
+  // The Profile object passed in to the constructor is destroyed after the
+  // login process is complete. Get the UserCloudPolicyManager from the user's
+  // default profile instead.
+  policy::UserCloudPolicyManager* cloud_policy_manager =
+      ProfileManager::GetDefaultProfile()->GetUserCloudPolicyManager();
+  if (cloud_policy_manager) {
+    if (token.empty())
+      cloud_policy_manager->CancelWaitForPolicyFetch();
+    else
+      cloud_policy_manager->RegisterClient(token);
+  }
 }
 
 }  // namespace chromeos