Remove WebContents::HasManifest.

chrome/browser/banners/app_banner_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/banners/app_banner_data_fetcher.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 88 matching lines @@
 
   content::WebContents* web_contents = GetWebContents();
   DCHECK(web_contents);
 
   is_active_ = true;
   was_canceled_by_page_ = false;
   page_requested_prompt_ = false;
   transition_type_ = transition_type;
   validated_url_ = validated_url;
   referrer_.erase();
-  web_contents->HasManifest(
-      base::Bind(&AppBannerDataFetcher::OnDidHasManifest, this));
+  web_contents->GetManifest(
+      base::Bind(&AppBannerDataFetcher::OnDidGetManifest, this));
 }
 
 void AppBannerDataFetcher::Cancel() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (is_active_) {
     FOR_EACH_OBSERVER(Observer, observer_list_,
                       OnDecidedWhetherToShow(this, false));
     if (was_canceled_by_page_ && !page_requested_prompt_) {
       TrackBeforeInstallEvent(
           BEFORE_INSTALL_EVENT_PROMPT_NOT_CALLED_AFTER_PREVENT_DEFAULT);
@@ skipping 142 matching lines @@
 
   AppBannerSettingsHelper::RecordBannerEvent(
       web_contents, validated_url_, GetAppIdentifier(),
       AppBannerSettingsHelper::APP_BANNER_EVENT_DID_SHOW,
       GetCurrentTime());
   rappor::SampleDomainAndRegistryFromGURL(g_browser_process->rappor_service(),
                                           event_name,
                                           web_contents->GetURL());
 }
 
-void AppBannerDataFetcher::OnDidHasManifest(bool has_manifest) {
-  content::WebContents* web_contents = GetWebContents();
-
-  if (!CheckFetcherIsStillAlive(web_contents) || !has_manifest) {
-    if (!has_manifest)
-      OutputDeveloperNotShownMessage(web_contents, kNoManifest, is_debug_mode_);
-
-    Cancel();
-    return;
-  }
-
-  web_contents->GetManifest(
-      base::Bind(&AppBannerDataFetcher::OnDidGetManifest, this));
-}
-
 void AppBannerDataFetcher::OnDidGetManifest(
     const GURL& manifest_url,
     const content::Manifest& manifest) {
   content::WebContents* web_contents = GetWebContents();
   if (!CheckFetcherIsStillAlive(web_contents)) {
     Cancel();
     return;
   }
+  if (manifest_url.is_empty()) {
+    OutputDeveloperNotShownMessage(web_contents, kNoManifest, is_debug_mode_);
+    Cancel();
+    return;
+  }
   if (manifest.IsEmpty()) {
     OutputDeveloperNotShownMessage(web_contents, kManifestEmpty,
                                    is_debug_mode_);
     Cancel();
     return;
   }
 
   if (manifest.prefer_related_applications &&
       manifest.related_applications.size()) {
     for (const auto& application : manifest.related_applications) {
@@ skipping 191 matching lines @@
 
   if (!DoesManifestContainRequiredIcon(manifest)) {
     OutputDeveloperNotShownMessage(web_contents, kManifestMissingSuitableIcon,
                                    is_debug_mode);
     return false;
   }
   return true;
 }
 
 }  // namespace banners