[Android] Make WebApplicationInfo and Web Manifest mutually exclusive

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/location.h"
@@ skipping 189 matching lines @@
 void AddToHomescreenDataFetcher::OnDidPerformInstallableCheck(
     const InstallableData& data) {
   data_timeout_timer_.Stop();
   badge_icon_.reset();
 
   if (!web_contents() || !weak_observer_ || is_installable_check_complete_)
     return;
 
   is_installable_check_complete_ = true;
 
-  bool webapk_compatible = false;
-  if (check_webapk_compatibility_) {
-    webapk_compatible = (data.error_code == NO_ERROR_DETECTED &&
-                         AreWebManifestUrlsWebApkCompatible(data.manifest));
-    weak_observer_->OnDidDetermineWebApkCompatibility(webapk_compatible);
+  if (!data.manifest.IsEmpty()) {
+    shortcut_info_ = ShortcutInfo(GURL());
 
-    if (webapk_compatible) {
-      // WebAPKs are wholly defined by the Web Manifest. Ignore the <meta> tag
-      // data received in OnDidGetWebApplicationInfo().
-      shortcut_info_ = ShortcutInfo(GURL());
-    }
-  }
-
-  if (!data.manifest.IsEmpty()) {
     base::RecordAction(base::UserMetricsAction("webapps.AddShortcut.Manifest"));
     shortcut_info_.UpdateFromManifest(data.manifest);

[dominickn, 2017/06/14 05:16:51]

This isn't quite what I was suggesting on the other CL. What I was suggesting
was adding an if statement right before this line:

if (!data.manifest.name.string().empty() ||
!data.manifest.short_name.string().empty()) {
  shortcut_info_.UpdateFromManifest(data.manifest);
}

The expected behaviour is that a site which specifies a manifest but has no name
or short name shows the <title> in the A2HS dialog. We do this by simply not
updating from the manifest if they haven't bothered to specify a name or
short_name. If they want a site that's standalone they fill in one of those two
fields.

The change you've made means that sites with a manifest with empty name or
short_name end up with an empty title in the A2HS dialog.

     shortcut_info_.manifest_url = data.manifest_url;
+  }
 
-    if (webapk_compatible) {
-      shortcut_info_.UpdateSource(ShortcutInfo::SOURCE_ADD_TO_HOMESCREEN_PWA);
-
-      if (data.badge_icon && !data.badge_icon->drawsNothing()) {
-        shortcut_info_.best_badge_icon_url = data.badge_icon_url;
-        badge_icon_ = *data.badge_icon;
-      }
-    }
+  if (data.badge_icon && !data.badge_icon->drawsNothing()) {
+    shortcut_info_.best_badge_icon_url = data.badge_icon_url;
+    badge_icon_ = *data.badge_icon;
   }
 
   // Save the splash screen URL for the later download.
   shortcut_info_.splash_image_url = ManifestIconSelector::FindBestMatchingIcon(
       data.manifest.icons, ideal_splash_image_size_in_px_,
       minimum_splash_image_size_in_px_,
       content::Manifest::Icon::IconPurpose::ANY);
   shortcut_info_.ideal_splash_image_size_in_px = ideal_splash_image_size_in_px_;
   shortcut_info_.minimum_splash_image_size_in_px =
       minimum_splash_image_size_in_px_;
 
+  if (check_webapk_compatibility_) {
+    bool webapk_compatible =
+        (data.error_code == NO_ERROR_DETECTED &&
+         AreWebManifestUrlsWebApkCompatible(data.manifest));
+    weak_observer_->OnDidDetermineWebApkCompatibility(webapk_compatible);
+
+    if (webapk_compatible)
+      shortcut_info_.UpdateSource(ShortcutInfo::SOURCE_ADD_TO_HOMESCREEN_PWA);
+  }
+
   weak_observer_->OnUserTitleAvailable(shortcut_info_.user_title);
 
   if (data.primary_icon) {
     shortcut_info_.best_primary_icon_url = data.primary_icon_url;
 
     CreateLauncherIcon(*(data.primary_icon));
     return;
   }
 
   FetchFavicon();
@@ skipping 82 matching lines @@
 void AddToHomescreenDataFetcher::NotifyObserver(const SkBitmap& primary_icon) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (!web_contents() || !weak_observer_ || is_icon_saved_)
     return;
 
   is_icon_saved_ = true;
   primary_icon_ = primary_icon;
   is_ready_ = true;
   weak_observer_->OnDataAvailable(shortcut_info_, primary_icon_, badge_icon_);
 }