Make sure GetAuthenticatedAccountId() returns a canonicalized id.

chrome/browser/signin/android_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_ANDROID_PROFILE_OAUTH2_TOKEN_SERVICE_H_
 #define CHROME_BROWSER_SIGNIN_ANDROID_PROFILE_OAUTH2_TOKEN_SERVICE_H_
 
 #include <jni.h>
 #include <string>
 
@@ skipping 93 matching lines @@
                                      const std::string& access_token) override;
 
   // Called to notify observers when a refresh token is available.
   virtual void FireRefreshTokenAvailable(
       const std::string& account_id) override;
   // Called to notify observers when a refresh token has been revoked.
   virtual void FireRefreshTokenRevoked(const std::string& account_id) override;
   // Called to notify observers when refresh tokans have been loaded.
   virtual void FireRefreshTokensLoaded() override;
 
+ private:
   // Return whether |signed_in_account| is valid and we have access
   // to all the tokens in |curr_account_ids|. If |force_notifications| is true,
   // TokenAvailable notifications will be sent anyway, even if the account was
   // already known.
   bool ValidateAccounts(const std::string& signed_in_account,
                         const std::vector<std::string>& prev_account_ids,
                         const std::vector<std::string>& curr_account_ids,
                         std::vector<std::string>& refreshed_ids,
                         std::vector<std::string>& revoked_ids,
                         bool force_notifications);
 
- private:
   base::android::ScopedJavaGlobalRef<jobject> java_ref_;
 
   static bool is_testing_profile_;
 
   DISALLOW_COPY_AND_ASSIGN(AndroidProfileOAuth2TokenService);
 };
 
 #endif  // CHROME_BROWSER_SIGNIN_ANDROID_PROFILE_OAUTH2_TOKEN_SERVICE_H_