[Merge To M58]Fix Default icon issue when cached icon file is corrupted.

chrome/browser/ui/app_list/arc/arc_app_icon.cc

 // Copyright 2015 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.
 
 #include "chrome/browser/ui/app_list/arc/arc_app_icon.h"
 
 #include <algorithm>
 #include <map>
 #include <memory>
 #include <utility>
@@ skipping 153 matching lines @@
 class ArcAppIcon::DecodeRequest : public ImageDecoder::ImageRequest {
  public:
   DecodeRequest(const base::WeakPtr<ArcAppIcon>& host,
                 int dimension,
                 ui::ScaleFactor scale_factor);
   ~DecodeRequest() override;
 
   // ImageDecoder::ImageRequest
   void OnImageDecoded(const SkBitmap& bitmap) override;
   void OnDecodeImageFailed() override;
+
  private:
   base::WeakPtr<ArcAppIcon> host_;
   int dimension_;
   ui::ScaleFactor scale_factor_;
 
   DISALLOW_COPY_AND_ASSIGN(DecodeRequest);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // ArcAppIcon::DecodeRequest
@@ skipping 14 matching lines @@
 
   if (!host_)
     return;
 
   int expected_dim = static_cast<int>(
       ui::GetScaleForScaleFactor(scale_factor_) * dimension_ + 0.5f);
   if (bitmap.width() != expected_dim || bitmap.height() != expected_dim) {
     VLOG(2) << "Decoded ARC icon has unexpected dimension "
             << bitmap.width() << "x" << bitmap.height() << ". Expected "
             << expected_dim << "x" << ".";
+
+    host_->MaybeRequestIcon(scale_factor_);
     host_->DiscardDecodeRequest(this);
     return;
   }
 
   gfx::ImageSkia image_skia;
   image_skia.AddRepresentation(gfx::ImageSkiaRep(
       bitmap,
       ui::GetScaleForScaleFactor(scale_factor_)));
-
   host_->Update(&image_skia);
   host_->DiscardDecodeRequest(this);
 }
 
 void ArcAppIcon::DecodeRequest::OnDecodeImageFailed() {
   VLOG(2) << "Failed to decode ARC icon.";
 
   if (!host_)
     return;
 
+  host_->MaybeRequestIcon(scale_factor_);
   host_->DiscardDecodeRequest(this);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ArcAppIcon
 
 // static
 void ArcAppIcon::DisableSafeDecodingForTesting() {
   disable_safe_decoding = true;
 }
@@ skipping 25 matching lines @@
     return;
 
   base::PostTaskWithTraitsAndReplyWithResult(
       FROM_HERE, base::TaskTraits().MayBlock().WithPriority(
                      base::TaskPriority::BACKGROUND),
       base::Bind(&ArcAppIcon::ReadOnFileThread, scale_factor, path,
                  prefs->MaybeGetIconPathForDefaultApp(app_id_, scale_factor)),
       base::Bind(&ArcAppIcon::OnIconRead, weak_ptr_factory_.GetWeakPtr()));
 }
 
-void ArcAppIcon::RequestIcon(ui::ScaleFactor scale_factor) {
+void ArcAppIcon::MaybeRequestIcon(ui::ScaleFactor scale_factor) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   ArcAppListPrefs* prefs = ArcAppListPrefs::Get(context_);
   DCHECK(prefs);
 
   // ArcAppListPrefs notifies ArcAppModelBuilder via Observer when icon is ready
   // and ArcAppModelBuilder refreshes the icon of the corresponding item by
   // calling LoadScaleFactor.
-  prefs->RequestIcon(app_id_, scale_factor);
+  prefs->MaybeRequestIcon(app_id_, scale_factor);
 }
 
 // static
 std::unique_ptr<ArcAppIcon::ReadResult> ArcAppIcon::ReadOnFileThread(
     ui::ScaleFactor scale_factor,
     const base::FilePath& path,
     const base::FilePath& default_app_path) {
   DCHECK(!path.empty());
 
   base::FilePath path_to_read;
   if (base::PathExists(path)) {
     path_to_read = path;
   } else {
     if (default_app_path.empty() || !base::PathExists(default_app_path)) {
-      return base::WrapUnique(new ArcAppIcon::ReadResult(
-          false, true, scale_factor, std::string()));
+      return base::MakeUnique<ArcAppIcon::ReadResult>(false, true, scale_factor,
+                                                      std::string());
     }
     path_to_read = default_app_path;
   }
 
+  bool request_to_install = path_to_read != path;
+
   // Read the file from disk.
   std::string unsafe_icon_data;
-  if (!base::ReadFileToString(path_to_read, &unsafe_icon_data)) {
+  if (!base::ReadFileToString(path_to_read, &unsafe_icon_data) ||
+      unsafe_icon_data.empty()) {
     VLOG(2) << "Failed to read an ARC icon from file " << path.MaybeAsASCII();
-    return base::WrapUnique(new ArcAppIcon::ReadResult(
-        true, path_to_read != path, scale_factor, std::string()));
+
+    // If |unsafe_icon_data| is empty typically means we have a file corruption
+    // on cached icon file. Send request to re install the icon.
+    request_to_install |= unsafe_icon_data.empty();
+    return base::MakeUnique<ArcAppIcon::ReadResult>(
+        true, request_to_install, scale_factor, std::string());
   }
 
-  return base::WrapUnique(new ArcAppIcon::ReadResult(false,
-                                                     path_to_read != path,
-                                                     scale_factor,
-                                                     unsafe_icon_data));
+  return base::MakeUnique<ArcAppIcon::ReadResult>(
+      false, request_to_install, scale_factor, unsafe_icon_data);
 }
 
 void ArcAppIcon::OnIconRead(
     std::unique_ptr<ArcAppIcon::ReadResult> read_result) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   if (read_result->request_to_install)
-    RequestIcon(read_result->scale_factor);
+    MaybeRequestIcon(read_result->scale_factor);
 
   if (!read_result->unsafe_icon_data.empty()) {
     decode_requests_.push_back(base::MakeUnique<DecodeRequest>(
         weak_ptr_factory_.GetWeakPtr(), resource_size_in_dip_,
         read_result->scale_factor));
     if (disable_safe_decoding) {
       SkBitmap bitmap;
       if (!read_result->unsafe_icon_data.empty() &&
           gfx::PNGCodec::Decode(
               reinterpret_cast<const unsigned char*>(
@@ skipping 31 matching lines @@
 void ArcAppIcon::DiscardDecodeRequest(DecodeRequest* request) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   auto it = std::find_if(decode_requests_.begin(), decode_requests_.end(),
                          [request](const std::unique_ptr<DecodeRequest>& ptr) {
                            return ptr.get() == request;
                          });
   CHECK(it != decode_requests_.end());
   decode_requests_.erase(it);
 }