Correctly deal with tokens for supervised users in ProfileOAuth2TokenService.

chrome/browser/signin/profile_oauth2_token_service.h

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_SIGNIN_PROFILE_OAUTH2_TOKEN_SERVICE_H_
 #define CHROME_BROWSER_SIGNIN_PROFILE_OAUTH2_TOKEN_SERVICE_H_
 
 #include <string>
 
 #include "base/gtest_prod_util.h"
@@ skipping 34 matching lines @@
                                   public WebDataServiceConsumer {
  public:
   // content::NotificationObserver listening for TokenService updates.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Initializes this token service with the profile.
   virtual void Initialize(Profile* profile);
 
+  // Loads credentials from a backing persistent store to make them available
+  // after service is used between profile restarts.
+  // Usually it's not necessary to directly call this method.

[Andrew T Wilson (Slow), 2013/11/05 14:52:23]

Are we moving this back down to private: once PO2TS self-loads in Initialize()?

[Bernhard Bauer, 2013/11/05 16:26:51]

Yes, that was my plan. I added a TODO to that effect.

+  void LoadCredentials();
+
   // BrowserContextKeyedService implementation.
   virtual void Shutdown() OVERRIDE;
 
   // Gets an account id of the primary account related to the profile.
   std::string GetPrimaryAccountId();
 
   // Lists account IDs of all accounts with a refresh token.
   virtual std::vector<std::string> GetAccounts() OVERRIDE;
 
   // Updates a |refresh_token| for an |account_id|. Credentials are persisted,
@@ skipping 75 matching lines @@
   // to information about the account.
   typedef std::map<std::string, linked_ptr<AccountInfo> > AccountInfoMap;
 
   FRIEND_TEST_ALL_PREFIXES(ProfileOAuth2TokenServiceTest,
                            TokenServiceUpdateClearsCache);
   FRIEND_TEST_ALL_PREFIXES(ProfileOAuth2TokenServiceTest,
                            PersistenceDBUpgrade);
   FRIEND_TEST_ALL_PREFIXES(ProfileOAuth2TokenServiceTest,
                            PersistenceLoadCredentials);
 
+  std::string GetAccountIdForMigratingRefreshToken();

[Andrew T Wilson (Slow), 2013/11/05 14:52:23]

Can you document this? It's not clear what this is.

[Bernhard Bauer, 2013/11/05 16:26:51]

Done.

+
   // WebDataServiceConsumer implementation:
   virtual void OnWebDataServiceRequestDone(
       WebDataServiceBase::Handle handle,
       const WDTypedResult* result) OVERRIDE;
 
-  // Loads credentials from a backing persistent store to make them available
-  // after service is used between profile restarts.
-  void LoadCredentials();
-
   // Loads credentials into in memory stucture.
   void LoadAllCredentialsIntoMemory(
       const std::map<std::string, std::string>& db_tokens);
 
   // Loads a single pair of |account_id|, |refresh_token| into memory.
   void LoadCredentialsIntoMemory(const std::string& account_id,
                                  const std::string& refresh_token);
 
   // The profile with which this instance was initialized, or NULL.
   Profile* profile_;
@@ skipping 10 matching lines @@
   // wrench menu).
   scoped_ptr<SigninGlobalError> signin_global_error_;
 
   // Registrar for notifications from the TokenService.
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileOAuth2TokenService);
 };
 
 #endif  // CHROME_BROWSER_SIGNIN_PROFILE_OAUTH2_TOKEN_SERVICE_H_