Fix componentization of chrome/browser/bookmarks

components/bookmarks/browser/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_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_
 #define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_
 
 #include <stdint.h>
 #include <map>
 #include <set>
@@ skipping 21 matching lines @@
 }
 
 namespace favicon_base {
 struct FaviconImageResult;
 }
 
 namespace query_parser {
 enum class MatchingAlgorithm;
 }
 
+namespace user_prefs {
+class PrefRegistrySyncable;
+}
+
 namespace bookmarks {
 
 class BookmarkCodecTest;
 class BookmarkExpandedStateTracker;
 class BookmarkIndex;
 class BookmarkLoadDetails;
 class BookmarkModelObserver;
 class BookmarkStorage;
 class ScopedGroupBookmarkActions;
 class TestBookmarkClient;
@@ skipping 12 matching lines @@
 class BookmarkModel : public KeyedService {
  public:
   struct URLAndTitle {
     GURL url;
     base::string16 title;
   };
 
   explicit BookmarkModel(BookmarkClient* client);
   ~BookmarkModel() override;
 
+  // Register preferences.
+  static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);

[tfarina, 2015/07/10 17:30:52]

By the way, I would do that separately, since it does not have anything to do
with Managed stuff, besides the Supervised pref. So I think that can be done in
another CL. Would you be OK to put that in another CL?

[sdefresne, 2015/07/16 07:23:33]

Make sense, removed from this CL and will do in a followup CL.

+
   // KeyedService:
   void Shutdown() override;
 
   // Loads the bookmarks. This is called upon creation of the
   // BookmarkModel. You need not invoke this directly.
   // All load operations will be executed on |io_task_runner| and the completion
   // callback will be called from |ui_task_runner|.
   void Load(PrefService* pref_service,
             const std::string& accept_languages,
             const base::FilePath& profile_path,
@@ skipping 364 matching lines @@
   scoped_ptr<BookmarkExpandedStateTracker> expanded_state_tracker_;
 
   std::set<std::string> non_cloned_keys_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkModel);
 };
 
 }  // namespace bookmarks
 
 #endif  // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_