Fix lifetime of EnhancedBookmarkModel & BookmarkImageService

components/enhanced_bookmarks/bookmark_image_service.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_BOOKMARK_IMAGE_SERVICE_H_
 #define COMPONENTS_ENHANCED_BOOKMARKS_BOOKMARK_IMAGE_SERVICE_H_
 
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "components/bookmarks/browser/bookmark_model_observer.h"
@@ skipping 20 matching lines @@
                        EnhancedBookmarkModel* enhanced_bookmark_model,
                        scoped_refptr<base::SequencedWorkerPool> pool);
   BookmarkImageService(scoped_ptr<ImageStore> store,
                        EnhancedBookmarkModel* enhanced_bookmark_model,
                        scoped_refptr<base::SequencedWorkerPool> pool);
 
   virtual ~BookmarkImageService();
 
   typedef base::Callback<void(const gfx::Image&, const GURL& url)> Callback;
 
+  // KeyedService:
+  virtual void Shutdown() OVERRIDE;
+
   // Returns a salient image for a URL. This may trigger a network request for
   // the image if the image was not retrieved before and if a bookmark node has
   // a URL for this salient image available.  The image (which may be empty) is
   // sent via the callback. The callback may be called synchronously if it is
   // possible. The callback is always triggered on the main thread.
   void SalientImageForUrl(const GURL& page_url, Callback callback);
 
   // BookmarkModelObserver methods.
   virtual void BookmarkNodeRemoved(BookmarkModel* model,
                                    const BookmarkNode* parent,
@@ skipping 109 matching lines @@
   GURL previous_url_;
 
   // The worker pool to enqueue the store requests onto.
   scoped_refptr<base::SequencedWorkerPool> pool_;
   DISALLOW_COPY_AND_ASSIGN(BookmarkImageService);
 };
 
 }  // namespace enhanced_bookmarks
 
 #endif  // COMPONENTS_ENHANCED_BOOKMARKS_BOOKMARK_IMAGE_SERVICE_H_