Revert "Revert of Add Search Service in Enhanced Bookmark Bridge (patchset #6 id:100001 of https://…

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 38 matching lines @@
 const BookmarkNode* BookmarkServerService::BookmarkForRemoteId(
     const std::string& remote_id) const {
   return model_->BookmarkForRemoteId(remote_id);
 }
 
 const std::string BookmarkServerService::RemoteIDForBookmark(
     const BookmarkNode* bookmark) const {
   return model_->GetRemoteId(bookmark);
 }
 
+void BookmarkServerService::Cancel() {
+  url_fetcher_.reset();
+  token_request_.reset();
+}
+
 void BookmarkServerService::Notify() {
   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.
@@ skipping 74 matching lines @@
 void BookmarkServerService::EnhancedBookmarkModelShuttingDown() {
   NOTREACHED();
 }
 
 SigninManagerBase* BookmarkServerService::GetSigninManager() {
   DCHECK(signin_manager_);
   return signin_manager_;
 }
 
 }  // namespace enhanced_bookmarks