1 files changed, 9 insertions, 8 deletions
diff --git a/chromium/chrome/browser/ui/webui/tab_strip/thumbnail_tracker.cc b/chromium/chrome/browser/ui/webui/tab_strip/thumbnail_tracker.cc
index 6c74dd96578..4ec05c2513a 100644
--- a/chromium/chrome/browser/ui/webui/tab_strip/thumbnail_tracker.cc
+++ b/chromium/chrome/browser/ui/webui/tab_strip/thumbnail_tracker.cc
@@ -7,9 +7,9 @@
 #include <memory>
 #include <utility>
 
+#include "base/macros.h"
 #include "base/scoped_observer.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/thumbnails/thumbnail_image.h"
 #include "chrome/browser/ui/thumbnails/thumbnail_tab_helper.h"
 #include "content/public/browser/web_contents_observer.h"
 
@@ -19,9 +19,7 @@ class ThumbnailTracker::ContentsData : public content::WebContentsObserver,
                                        public ThumbnailImage::Observer {
  public:
   ContentsData(ThumbnailTracker* parent, content::WebContents* contents)
-      : content::WebContentsObserver(contents),
-        parent_(parent),
-        observer_(this) {
+      : content::WebContentsObserver(contents), parent_(parent) {
     thumbnail_ = parent_->thumbnail_getter_.Run(contents);
     if (thumbnail_)
       observer_.Add(thumbnail_.get());
@@ -29,7 +27,7 @@ class ThumbnailTracker::ContentsData : public content::WebContentsObserver,
 
   void RequestThumbnail() {
     if (thumbnail_)
-      thumbnail_->RequestThumbnailImage();
+      thumbnail_->RequestCompressedThumbnailData();
   }
 
   // content::WebContents:
@@ -46,14 +44,17 @@ class ThumbnailTracker::ContentsData : public content::WebContentsObserver,
   }
 
   // ThumbnailImage::Observer:
-  void OnThumbnailImageAvailable(gfx::ImageSkia thumbnail_image) override {
+  void OnCompressedThumbnailDataAvailable(
+      CompressedThumbnailData thumbnail_image) override {
     parent_->ThumbnailUpdated(web_contents(), thumbnail_image);
   }
 
  private:
   ThumbnailTracker* parent_;
   scoped_refptr<ThumbnailImage> thumbnail_;
-  ScopedObserver<ThumbnailImage, ContentsData> observer_;
+  ScopedObserver<ThumbnailImage, ThumbnailImage::Observer> observer_{this};
+
+  DISALLOW_COPY_AND_ASSIGN(ContentsData);
 };
 
 ThumbnailTracker::ThumbnailTracker(ThumbnailUpdatedCallback callback)
@@ -78,7 +79,7 @@ void ThumbnailTracker::WatchTab(content::WebContents* contents) {
 }
 
 void ThumbnailTracker::ThumbnailUpdated(content::WebContents* contents,
-                                        gfx::ImageSkia image) {
+                                        CompressedThumbnailData image) {
   callback_.Run(contents, image);
 }