Index: components/enhanced_bookmarks/bookmark_server_service.cc |
diff --git a/components/enhanced_bookmarks/bookmark_server_service.cc b/components/enhanced_bookmarks/bookmark_server_service.cc |
index 08217a2bcd55def00c9e35d9b48dc930603bcc8f..b6bd5833ca84001a409a85ed8a99375ed54ae918 100644 |
--- a/components/enhanced_bookmarks/bookmark_server_service.cc |
+++ b/components/enhanced_bookmarks/bookmark_server_service.cc |
@@ -48,7 +48,11 @@ |
const BookmarkNode* BookmarkServerService::BookmarkForRemoteId( |
const std::string& remote_id) const { |
- return model_->BookmarkForRemoteId(remote_id); |
+ 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; |
} |
const std::string BookmarkServerService::RemoteIDForBookmark( |
@@ -87,8 +91,7 @@ |
const OAuth2TokenService::Request* request, |
const std::string& access_token, |
const base::Time& expiration_time) { |
- url_fetcher_ = CreateFetcher(); |
- |
+ url_fetcher_.reset(CreateFetcher()); |
// Free the token request. |
token_request_.reset(); |