Call AddToHomescreenDataFetcher::Observer callbacks when manifest fetch times out

chrome/browser/android/webapps/add_to_homescreen_data_fetcher.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/android/webapps/add_to_homescreen_data_fetcher.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 67 matching lines @@
     : WebContentsObserver(web_contents),
       weak_observer_(observer),
       shortcut_info_(GetShortcutUrl(web_contents->GetBrowserContext(),
                                     web_contents->GetLastCommittedURL())),
       data_timeout_timer_(false, false),
       ideal_icon_size_in_dp_(ideal_icon_size_in_dp),
       minimum_icon_size_in_dp_(minimum_icon_size_in_dp),
       ideal_splash_image_size_in_dp_(ideal_splash_image_size_in_dp),
       minimum_splash_image_size_in_dp_(minimum_splash_image_size_in_dp),
       check_installable_(check_installable),
-      is_waiting_for_installable_check_(check_installable),
       is_waiting_for_web_application_info_(true),
       is_icon_saved_(false),
       is_ready_(false) {
   DCHECK(minimum_icon_size_in_dp <= ideal_icon_size_in_dp);
   DCHECK(minimum_splash_image_size_in_dp <= ideal_splash_image_size_in_dp);
 
   // Send a message to the renderer to retrieve information about the page.
   Send(new ChromeViewMsg_GetWebApplicationInfo(routing_id()));
 }
 
@@ skipping 57 matching lines @@
       base::Bind(&AddToHomescreenDataFetcher::OnDidPerformInstallableCheck,
                  this));
 }
 
 void AddToHomescreenDataFetcher::OnDidPerformInstallableCheck(
     const InstallableData& data) {
   if (!web_contents() || !weak_observer_)
     return;
 
   if (check_installable_) {
-    is_waiting_for_installable_check_ = false;
     weak_observer_->OnDidDetermineWebApkCompatibility(data.is_installable);
   }
 
   if (!data.manifest.IsEmpty()) {
     content::RecordAction(
         base::UserMetricsAction("webapps.AddShortcut.Manifest"));
     shortcut_info_.UpdateFromManifest(data.manifest);
     shortcut_info_.manifest_url = data.manifest_url;
   }
 
@@ skipping 46 matching lines @@
     const std::string& webapp_id) {
   return base::Bind(&ShortcutHelper::FetchSplashScreenImage, web_contents(),
                     splash_screen_url_, ideal_splash_image_size_in_dp_,
                     minimum_splash_image_size_in_dp_, webapp_id);
 }
 
 void AddToHomescreenDataFetcher::FetchFavicon() {
   if (!web_contents() || !weak_observer_)
     return;
 
-  if (check_installable_ && is_waiting_for_installable_check_) {

[pkotwicz, 2016/09/15 22:44:41]

I don't see how this if() statement evaluates to true.

FetchFavicon() is private. OnDidPerformInstallableCheck() is the only caller.

-    is_waiting_for_installable_check_ = false;
-    weak_observer_->OnDidDetermineWebApkCompatibility(false);
-  }
-
   // Grab the best, largest icon we can find to represent this bookmark.
   // TODO(dfalcantara): Try combining with the new BookmarksHandler once its
   //                    rewrite is further along.
   std::vector<int> icon_types{
       favicon_base::FAVICON,
       favicon_base::TOUCH_PRECOMPOSED_ICON | favicon_base::TOUCH_ICON};
 
   favicon::FaviconService* favicon_service =
       FaviconServiceFactory::GetForProfile(
           Profile::FromBrowserContext(web_contents()->GetBrowserContext()),
@@ skipping 59 matching lines @@
 void AddToHomescreenDataFetcher::NotifyObserver(const SkBitmap& icon) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (!web_contents() || !weak_observer_ || is_icon_saved_)
     return;
 
   is_icon_saved_ = true;
   shortcut_icon_ = icon;
   is_ready_ = true;
   weak_observer_->OnDataAvailable(shortcut_info_, shortcut_icon_);
 }