Make sure GetAuthenticatedAccountId() returns a canonicalized id.

google_apis/drive/auth_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 "google_apis/drive/auth_service.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 112 matching lines @@
     const std::vector<std::string>& scopes)
     : oauth2_token_service_(oauth2_token_service),
       account_id_(account_id),
       url_request_context_getter_(url_request_context_getter),
       scopes_(scopes),
       weak_ptr_factory_(this) {
   DCHECK(oauth2_token_service);
 
   // Get OAuth2 refresh token (if we have any) and register for its updates.
   oauth2_token_service_->AddObserver(this);
-  has_refresh_token_ = oauth2_token_service_->RefreshTokenIsAvailable(
-      account_id_);
+  has_refresh_token_ = !account_id_.empty() &&
+      oauth2_token_service_->RefreshTokenIsAvailable(account_id_);
 }
 
 AuthService::~AuthService() {
   oauth2_token_service_->RemoveObserver(this);
 }
 
 void AuthService::StartAuthentication(const AuthStatusCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (HasAccessToken()) {
@@ skipping 78 matching lines @@
 void AuthService::OnHandleRefreshToken(bool has_refresh_token) {
   access_token_.clear();
   has_refresh_token_ = has_refresh_token;
 
   FOR_EACH_OBSERVER(AuthServiceObserver,
                     observers_,
                     OnOAuth2RefreshTokenChanged());
 }
 
 }  // namespace google_apis