[Merge M58] Fix randomly disappearing icons in app list recent view.

chrome/browser/ui/app_list/search/extension_app_result.cc

 // Copyright 2013 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/search/extension_app_result.h"
 
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
 #include "chrome/browser/ui/app_list/extension_app_context_menu.h"
@@ skipping 26 matching lines @@
     : AppResult(profile, app_id, controller, is_recommendation) {
   set_id(extensions::Extension::GetBaseURLFromExtensionId(app_id).spec());
 
   const extensions::Extension* extension =
       extensions::ExtensionRegistry::Get(profile)->GetInstalledExtension(
           app_id);
   DCHECK(extension);
 
   is_platform_app_ = extension->is_platform_app();
 
-  icon_.reset(
-      new extensions::IconImage(profile,
-                                extension,
-                                extensions::IconsInfo::GetIcons(extension),
-                                GetPreferredIconDimension(),
-                                extensions::util::GetDefaultAppIcon(),
-                                this));
-  UpdateIcon();
+  CreateOrUpdateIcon();
 
   StartObservingExtensionRegistry();
 }
 
 ExtensionAppResult::~ExtensionAppResult() {
   StopObservingExtensionRegistry();
 }
 
+void ExtensionAppResult::CreateOrUpdateIcon() {
+  if (icon_ && icon_->is_valid()) {
+    UpdateIcon();
+    return;
+  }
+
+  const extensions::Extension* extension =
+      extensions::ExtensionRegistry::Get(profile())->GetInstalledExtension(
+          app_id());
+  DCHECK(extension);
+
+  icon_ = base::MakeUnique<extensions::IconImage>(
+      profile(), extension, extensions::IconsInfo::GetIcons(extension),
+      GetPreferredIconDimension(), extensions::util::GetDefaultAppIcon(), this);
+  UpdateIcon();
+}
+
 void ExtensionAppResult::Open(int event_flags) {
   RecordHistogram(APP_SEARCH_RESULT);
   const extensions::Extension* extension =
       extensions::ExtensionRegistry::Get(profile())->GetInstalledExtension(
           app_id());
   if (!extension)
     return;
 
   // Don't auto-enable apps that cannot be launched.
   if (!extensions::util::IsAppLaunchable(app_id(), profile()))
@@ skipping 104 matching lines @@
 }
 
 void ExtensionAppResult::ExtensionEnableFlowAborted(bool user_initiated) {
   extension_enable_flow_.reset();
   controller()->OnCloseChildDialog();
 }
 
 void ExtensionAppResult::OnExtensionLoaded(
     content::BrowserContext* browser_context,
     const extensions::Extension* extension) {
-  UpdateIcon();
+  // Old |icon_| might be invalidated for forever in case extension gets
+  // updated. In this case we need re-create icon again.
+  CreateOrUpdateIcon();
 }
 
 void ExtensionAppResult::OnShutdown(extensions::ExtensionRegistry* registry) {
   DCHECK_EQ(extension_registry_, registry);
   StopObservingExtensionRegistry();
 }
 
 }  // namespace app_list