Bring up of the enhanced bookmarks cluster service.

This service retrieves the cluster of bookmarks from the bookmark
server.

BUG=None

Committed: https://crrev.com/6bb374fc58bfeeb7966b6a548b1c7b41af9c8e47
Cr-Commit-Position: refs/heads/master@{#298582}

Review URL: https://codereview.chromium.org/539173004

Cr-Commit-Position: refs/heads/master@{#298682}

1 files changed, 3 insertions, 6 deletions

diff --git a/components/enhanced_bookmarks/bookmark_server_service.cc b/components/enhanced_bookmarks/bookmark_server_service.cc
index b6bd583..08217a2 100644
--- a/components/enhanced_bookmarks/bookmark_server_service.cc
+++ b/components/enhanced_bookmarks/bookmark_server_service.cc
@@ -48,11 +48,7 @@ void BookmarkServerService::RemoveObserver(
 
 const BookmarkNode* BookmarkServerService::BookmarkForRemoteId(
     const std::string& remote_id) const {
-  std::map<std::string, const BookmarkNode*>::const_iterator it =
-      starsid_to_bookmark_.find(remote_id);
-  if (it == starsid_to_bookmark_.end())
-    return NULL;
-  return it->second;
+  return model_->BookmarkForRemoteId(remote_id);
 }
 
 const std::string BookmarkServerService::RemoteIDForBookmark(
@@ -91,7 +87,8 @@ void BookmarkServerService::OnGetTokenSuccess(
     const OAuth2TokenService::Request* request,
     const std::string& access_token,
     const base::Time& expiration_time) {
-  url_fetcher_.reset(CreateFetcher());
+  url_fetcher_ = CreateFetcher();
+
   // Free the token request.
   token_request_.reset();