Revert of Bring up of the enhanced bookmarks cluster service.

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 30 matching lines @@
   observers_.AddObserver(observer);
 }
 
 void BookmarkServerService::RemoveObserver(
     BookmarkServerServiceObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 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(
     const BookmarkNode* bookmark) const {
   return model_->GetRemoteId(bookmark);
 }
 
 void BookmarkServerService::Notify() {
   FOR_EACH_OBSERVER(BookmarkServerServiceObserver, observers_, OnChange(this));
 }
@@ skipping 18 matching lines @@
   token_request_ = token_service_->StartRequest(username, scopes, this);
 }
 
 //
 // OAuth2AccessTokenConsumer methods.
 //
 void BookmarkServerService::OnGetTokenSuccess(
     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();
 
   if (!url_fetcher_) {
     CleanAfterFailure();
     Notify();
     return;
   }
   url_fetcher_->SetRequestContext(request_context_getter_.get());
 
@@ skipping 41 matching lines @@
 void BookmarkServerService::EnhancedBookmarkModelShuttingDown() {
   NOTREACHED();
 }
 
 SigninManagerBase* BookmarkServerService::GetSigninManager() {
   DCHECK(signin_manager_);
   return signin_manager_;
 }
 
 }  // namespace enhanced_bookmarks