Setup Sync to use OAuth token for managed users.

chrome/browser/policy/cloud/user_policy_signin_service.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/policy/cloud/user_policy_signin_service.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/managed_mode/managed_user_service.h"

[Joao da Silva, 2013/06/12 15:30:29]

#ifdef managed mode

[Bernhard Bauer, 2013/06/12 19:01:39]

Done.

 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/cloud/cloud_policy_client.h"
 #include "chrome/browser/policy/cloud/cloud_policy_service.h"
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager.h"
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
 #include "chrome/browser/policy/cloud/user_info_fetcher.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
@@ skipping 198 matching lines @@
   DCHECK_EQ(client, client_);
   RequestCompleted();
 }
 
 UserPolicySigninService::UserPolicySigninService(
     Profile* profile)
     : profile_(profile),
       weak_factory_(this) {
   if (profile_->GetPrefs()->GetBoolean(prefs::kDisableCloudPolicyOnSignin))
     return;
 

[Joao da Silva, 2013/06/12 15:30:29]

The managed mode check should be here, and return early if the profile is
managed.

[Bernhard Bauer, 2013/06/12 19:01:39]

Done.

   // Initialize/shutdown the UserCloudPolicyManager when the user signs out.
   registrar_.Add(this,
                  chrome::NOTIFICATION_GOOGLE_SIGNED_OUT,
                  content::Source<Profile>(profile));
 
   // Listen for an OAuth token to become available so we can register a client
   // if for some reason the client is not already registered (for example, if
   // the policy load failed during initial signin).
   registrar_.Add(this,
                  chrome::NOTIFICATION_TOKEN_AVAILABLE,
@@ skipping 150 matching lines @@
         ShutdownUserCloudPolicyManager();
       else
         InitializeForSignedInUser();
       break;
     }
     case chrome::NOTIFICATION_TOKEN_AVAILABLE: {
       const TokenService::TokenAvailableDetails& token_details =
           *(content::Details<const TokenService::TokenAvailableDetails>(
               details).ptr());
       if (token_details.service() ==
-          GaiaConstants::kGaiaOAuth2LoginRefreshToken) {
+              GaiaConstants::kGaiaOAuth2LoginRefreshToken &&
+          !ManagedUserService::ProfileIsManaged(profile_)) {

[Joao da Silva, 2013/06/12 15:30:29]

#ifdef after moving

[Bernhard Bauer, 2013/06/12 19:01:39]

Done.

         SigninManager* signin_manager =
             SigninManagerFactory::GetForProfile(profile_);
         std::string username = signin_manager->GetAuthenticatedUsername();
         // Should not have GAIA tokens if the user isn't signed in.
         DCHECK(!username.empty());
         // TokenService now has a refresh token (implying that the user is
         // signed in) so initialize the UserCloudPolicyManager.
         InitializeForSignedInUser();
       }
       break;
@@ skipping 169 matching lines @@
   // before UserCloudPolicyManager shuts down the CloudPolicyClient.
   registration_helper_.reset();
   StopObserving();
 }
 
 UserCloudPolicyManager* UserPolicySigninService::GetManager() {
   return UserCloudPolicyManagerFactory::GetForProfile(profile_);
 }
 
 }  // namespace policy