Avoid trying to load policy on re-auth.

chrome/browser/signin/signin_manager.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/signin/signin_manager.h"
 
 #include <string>
 #include <vector>
 
 #include "base/callback_helpers.h"
@@ skipping 664 matching lines @@
   if (type_ == SIGNIN_TYPE_WITH_CREDENTIALS &&
       !gaia::AreEmailsSame(display_email_iter->second,
                            possibly_invalid_username_)) {
     OnGetUserInfoKeyNotFound(kGetInfoDisplayEmailKey);
     return;
   }
 
   possibly_invalid_username_ = email_iter->second;
 
 #if defined(ENABLE_CONFIGURATION_POLICY) && !defined(OS_CHROMEOS)
-  // TODO(atwilson): Refactor this to expose an observer interface to allow
-  // UserPolicySigninService and OneClickSignin to display UI here, instead
-  // of having this logic in SigninManager.
-  // If we have an OAuth token, try loading policy for this user now, before
-  // any signed in services are initialized. If there's no oauth token (the
-  // user is using the old ClientLogin flow) then policy will get loaded once
-  // the TokenService finishes initializing (not ideal, but it's a reasonable
-  // fallback).
-  if (!temp_oauth_login_tokens_.refresh_token.empty()) {
+  // TODO(atwilson): Move this code out to OneClickSignin instead of having
+  // it embedded in SigninManager - we don't want UI logic in SigninManager.
+  // If this is a new signin (authenticated_username_ is not set) and we have
+  // an OAuth token, try loading policy for this user now, before any signed in
+  // services are initialized. If there's no oauth token (the user is using the
+  // old ClientLogin flow) then policy will get loaded once the TokenService
+  // finishes initializing (not ideal, but it's a reasonable fallback).
+  if (authenticated_username_.empty() &&
+      !temp_oauth_login_tokens_.refresh_token.empty()) {
     policy::UserPolicySigninService* policy_service =
         policy::UserPolicySigninServiceFactory::GetForProfile(profile_);
     policy_service->RegisterPolicyClient(
         possibly_invalid_username_,
         temp_oauth_login_tokens_.refresh_token,
         base::Bind(&SigninManager::OnRegisteredForPolicy,
                    weak_pointer_factory_.GetWeakPtr()));
     return;
   }
 #endif
@@ skipping 212 matching lines @@
                     NotifySigninValueChanged(field, value));
 }
 
 void SigninManager::NotifyDiagnosticsObservers(
     const TimedSigninStatusField& field,
     const std::string& value) {
   FOR_EACH_OBSERVER(SigninDiagnosticsObserver,
                     signin_diagnostics_observers_,
                     NotifySigninValueChanged(field, value));
 }