diff options
| author | rogerta <rogerta@chromium.org> | 2014-10-09 15:27:22 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-09 22:28:29 +0000 |
| commit | d013a1ff64f832016aa0980d74622d32e29276e3 (patch) | |
| tree | 3c7441b787df1a93ad52ab7cb1eb4fc96c1ce697 /components/enhanced_bookmarks/bookmark_server_service.cc | |
| parent | 9ed24d0a4d60d7d35cabb0acac6ed8df20e2a69a (diff) | |
| download | chromium_src-d013a1ff64f832016aa0980d74622d32e29276e3.zip chromium_src-d013a1ff64f832016aa0980d74622d32e29276e3.tar.gz chromium_src-d013a1ff64f832016aa0980d74622d32e29276e3.tar.bz2 | |
Make sure GetAuthenticatedAccountId() returns a canonicalized id.
This CL is a prerequisite for:
https://codereview.chromium.org/473153002/
BUG=341408
TBR=benwells@chromium.org
Review URL: https://codereview.chromium.org/617183003
Cr-Commit-Position: refs/heads/master@{#298996}
Diffstat (limited to 'components/enhanced_bookmarks/bookmark_server_service.cc')
| -rw-r--r-- | components/enhanced_bookmarks/bookmark_server_service.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/enhanced_bookmarks/bookmark_server_service.cc b/components/enhanced_bookmarks/bookmark_server_service.cc index 08217a2..1e6f4b0 100644 --- a/components/enhanced_bookmarks/bookmark_server_service.cc +++ b/components/enhanced_bookmarks/bookmark_server_service.cc @@ -67,8 +67,7 @@ void BookmarkServerService::TriggerTokenRequest(bool cancel_previous) { 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(); @@ -77,7 +76,8 @@ void BookmarkServerService::TriggerTokenRequest(bool cancel_previous) { // 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); } // |