Revert of Bring up of the enhanced bookmarks cluster service.

components/enhanced_bookmarks/bookmark_server_search_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_search_service.h"
 
-#include "components/enhanced_bookmarks/enhanced_bookmark_model.h"
 #include "components/enhanced_bookmarks/enhanced_bookmark_utils.h"
 #include "components/enhanced_bookmarks/proto/search.pb.h"
 #include "net/base/url_util.h"
 #include "net/url_request/url_fetcher.h"
 
 namespace {
 const std::string kSearchUrl(
     "https://www.google.com/stars/search");
 }  // namespace
 
@@ skipping 32 matching lines @@
   for (std::vector<std::string>::iterator clip_it = it->second.begin();
        clip_it != it->second.end();
        ++clip_it) {
     const BookmarkNode* node = BookmarkForRemoteId(*clip_it);
     if (node)
       result.push_back(node);
   }
   return result;
 }
 
-scoped_ptr<net::URLFetcher> BookmarkServerSearchService::CreateFetcher() {
+net::URLFetcher* BookmarkServerSearchService::CreateFetcher() {
   // Add the necessary arguments to the URI.
   GURL url(kSearchUrl);
   url = net::AppendQueryParameter(url, "output", "proto");
   url = net::AppendQueryParameter(url, "q", current_query_);
-  url = net::AppendQueryParameter(url, "v", model_->GetVersionString());
 
   // Build the URLFetcher to perform the request.
-  scoped_ptr<net::URLFetcher> url_fetcher(
-      net::URLFetcher::Create(url, net::URLFetcher::GET, this));
+  net::URLFetcher* url_fetcher =
+      net::URLFetcher::Create(url, net::URLFetcher::GET, this);
 
   return url_fetcher;
 }
 
 bool BookmarkServerSearchService::ProcessResponse(const std::string& response,
                                                   bool* should_notify) {
   DCHECK(*should_notify);
   DCHECK(current_query_.length());
   image::collections::CorpusSearchResult response_proto;
   bool result = response_proto.ParseFromString(response);
@@ skipping 29 matching lines @@
   searches_.clear();
 }
 
 void BookmarkServerSearchService::EnhancedBookmarkRemoteIdChanged(
     const BookmarkNode* node,
     const std::string& old_remote_id,
     const std::string& remote_id) {
   searches_.clear();
 }
 }  // namespace enhanced_bookmarks