Revert of Fix three causes of blank thumbnails.

chrome/browser/android/compositor/tab_content_manager.cc

Index: chrome/browser/android/compositor/tab_content_manager.cc
diff --git a/chrome/browser/android/compositor/tab_content_manager.cc b/chrome/browser/android/compositor/tab_content_manager.cc
index 67373dbc1ad7a6bc26c4dee41b669d6d45cb6ef8..12f582fee61c43047cd94e278dafa07285caa170 100644
--- a/chrome/browser/android/compositor/tab_content_manager.cc
+++ b/chrome/browser/android/compositor/tab_content_manager.cc
@@ -217,17 +217,18 @@
   content::WebContents* web_contents = tab_android->web_contents();
   DCHECK(web_contents);
 
-  if (!web_contents->GetRenderViewHost() ||
-      !web_contents->GetRenderViewHost()->GetWidget() ||
-      !web_contents->GetRenderViewHost()
-           ->GetWidget()
-           ->CanCopyFromBackingStore() ||
-      pending_tab_readbacks_.find(tab_id) != pending_tab_readbacks_.end() ||
-      pending_tab_readbacks_.size() >= kMaxReadbacks) {
-    return;
-  }
-
   if (thumbnail_cache_->CheckAndUpdateThumbnailMetaData(tab_id, url)) {
+    if (!web_contents->GetRenderViewHost() ||
+        !web_contents->GetRenderViewHost()->GetWidget() ||
+        !web_contents->GetRenderViewHost()
+             ->GetWidget()
+             ->CanCopyFromBackingStore() ||
+        pending_tab_readbacks_.find(tab_id) != pending_tab_readbacks_.end() ||
+        pending_tab_readbacks_.size() >= kMaxReadbacks) {
+      thumbnail_cache_->Remove(tab_id);
+      return;
+    }
+
     TabReadbackCallback readback_done_callback =
         base::Bind(&TabContentManager::PutThumbnailIntoCache,
                    weak_factory_.GetWeakPtr(), tab_id);