Revert of Bring up of the enhanced bookmarks cluster service.

components/enhanced_bookmarks/enhanced_bookmark_model.h

 // 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.
 
 #ifndef COMPONENTS_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARK_MODEL_H_
 #define COMPONENTS_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARK_MODEL_H_
 
 #include <map>
 #include <string>
 
@@ skipping 109 matching lines @@
                     int thumbnail_width,
                     int thumbnail_height);
 
   // TODO(rfevang): Ideally nothing should need the underlying bookmark model.
   // Remove when that is actually the case.
   BookmarkModel* bookmark_model() { return bookmark_model_; }
 
   // Returns true if the enhanced bookmark model is done loading.
   bool loaded() { return loaded_; }
 
-  // Returns the version string to use when setting stars.version.
-  std::string GetVersionString();
-
  private:
   FRIEND_TEST_ALL_PREFIXES(::EnhancedBookmarkModelTest, SetMultipleMetaInfo);
 
   typedef std::map<std::string, const BookmarkNode*> IdToNodeMap;
   typedef std::map<const BookmarkNode*, std::string> NodeToIdMap;
 
   // BaseBookmarkModelObserver:
   virtual void BookmarkModelChanged() override;
   virtual void BookmarkModelLoaded(BookmarkModel* model,
                                    bool ids_reassigned) override;
@@ skipping 32 matching lines @@
   void SetMetaInfo(const BookmarkNode* node,
                    const std::string& field,
                    const std::string& value);
 
   // Helper method for setting multiple meta info fields at once. All the fields
   // in |meta_info| will be set, but the method will not delete fields not
   // present.
   void SetMultipleMetaInfo(const BookmarkNode* node,
                            BookmarkNode::MetaInfoMap meta_info);
 
+  // Returns the version string to use when setting stars.version.
+  std::string GetVersionString();
+
   BookmarkModel* bookmark_model_;
   bool loaded_;
 
   ObserverList<EnhancedBookmarkModelObserver> observers_;
 
   base::WeakPtrFactory<EnhancedBookmarkModel> weak_ptr_factory_;
 
   IdToNodeMap id_map_;
   NodeToIdMap nodes_to_reset_;
 
   // Caches the remote id of a node before its meta info changes.
   std::string prev_remote_id_;
 
   std::string version_;
   std::string version_suffix_;
 };
 
 }  // namespace enhanced_bookmarks
 
 #endif  // COMPONENTS_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARK_MODEL_H_