Make sure GetAuthenticatedAccountId() returns a canonicalized id.

components/enhanced_bookmarks/bookmark_server_service.cc

 // Copyright 2014 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 "components/enhanced_bookmarks/bookmark_server_service.h"
 
 #include "base/auto_reset.h"
 #include "components/enhanced_bookmarks/enhanced_bookmark_model.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager_base.h"
@@ skipping 53 matching lines @@
   FOR_EACH_OBSERVER(BookmarkServerServiceObserver, observers_, OnChange(this));
 }
 
 void BookmarkServerService::TriggerTokenRequest(bool cancel_previous) {
   if (cancel_previous)
     url_fetcher_.reset();
 
   if (token_request_ || url_fetcher_)
     return;  // Fetcher is already running.
 
-  const std::string username(signin_manager_->GetAuthenticatedUsername());
-  if (!username.length()) {
+  if (!signin_manager_->IsAuthenticated()) {
     // User is not signed in.
     CleanAfterFailure();
     Notify();
     return;
   }
   // Find a token.
   OAuth2TokenService::ScopeSet scopes;
   scopes.insert(GaiaConstants::kChromeSyncOAuth2Scope);
-  token_request_ = token_service_->StartRequest(username, scopes, this);
+  token_request_ = token_service_->StartRequest(
+      signin_manager_->GetAuthenticatedAccountId(), scopes, this);
 }
 
 //
 // OAuth2AccessTokenConsumer methods.
 //
 void BookmarkServerService::OnGetTokenSuccess(
     const OAuth2TokenService::Request* request,
     const std::string& access_token,
     const base::Time& expiration_time) {
   url_fetcher_.reset(CreateFetcher());
@@ skipping 51 matching lines @@
 void BookmarkServerService::EnhancedBookmarkModelShuttingDown() {
   NOTREACHED();
 }
 
 SigninManagerBase* BookmarkServerService::GetSigninManager() {
   DCHECK(signin_manager_);
   return signin_manager_;
 }
 
 }  // namespace enhanced_bookmarks