Revert of Bring up of the enhanced bookmarks cluster service.

components/enhanced_bookmarks/bookmark_server_service.h

Index: components/enhanced_bookmarks/bookmark_server_service.h
diff --git a/components/enhanced_bookmarks/bookmark_server_service.h b/components/enhanced_bookmarks/bookmark_server_service.h
index d8cba89b66fcf39f04b0141b13e844779fe73060..8df0e2f878089b476d7be4361c5f50590c209952 100644
--- a/components/enhanced_bookmarks/bookmark_server_service.h
+++ b/components/enhanced_bookmarks/bookmark_server_service.h
@@ -64,7 +64,7 @@
   void TriggerTokenRequest(bool cancel_previous);
 
   // Build the query to send to the server. Returns a newly created url_fetcher.
-  virtual scoped_ptr<net::URLFetcher> CreateFetcher() = 0;
+  virtual net::URLFetcher* CreateFetcher() = 0;
 
   // Processes the response to the query. Returns true on successful parsing,
   // false on failure. The implementation can assume that |should_notify| is set
@@ -86,7 +86,6 @@
 
  private:
   FRIEND_TEST_ALL_PREFIXES(BookmarkServerServiceTest, Cluster);
-  FRIEND_TEST_ALL_PREFIXES(BookmarkServerServiceTest, SignOut);
   FRIEND_TEST_ALL_PREFIXES(BookmarkServerServiceTest,
                            ClearClusterMapOnRemoveAllBookmarks);
 
@@ -112,6 +111,8 @@
   scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
   // The fetcher used to query the server.
   scoped_ptr<net::URLFetcher> url_fetcher_;
+  // A map from stars.id to bookmark nodes. With no null entries.
+  std::map<std::string, const BookmarkNode*> starsid_to_bookmark_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkServerService);
 };