Fix lifetime of EnhancedBookmarkModel & BookmarkImageService

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 20 matching lines @@
 
 // Wrapper around BookmarkModel providing utility functions for enhanced
 // bookmarks.
 class EnhancedBookmarkModel : public KeyedService,
                               public BaseBookmarkModelObserver {
  public:
   EnhancedBookmarkModel(BookmarkModel* bookmark_model,
                         const std::string& version);
   virtual ~EnhancedBookmarkModel();
 
-  virtual void ShutDown();
+  virtual void Shutdown() OVERRIDE;
 
   void AddObserver(EnhancedBookmarkModelObserver* observer);
   void RemoveObserver(EnhancedBookmarkModelObserver* observer);
 
   // Moves |node| to |new_parent| and inserts it at the given |index|.
   void Move(const BookmarkNode* node,
             const BookmarkNode* new_parent,
             int index);
 
   // Adds a new folder node at the specified position.
@@ skipping 143 matching lines @@
   // 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_