[Android] Suggest page title for homescreen shortcut when Web Manifest is empty

chrome/browser/android/shortcut_info.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/shortcut_info.h"
 
 ShortcutInfo::ShortcutInfo(const GURL& shortcut_url)
     : url(shortcut_url),
       display(blink::kWebDisplayModeBrowser),
       orientation(blink::kWebScreenOrientationLockDefault),
       source(SOURCE_ADD_TO_HOMESCREEN_SHORTCUT),
       theme_color(content::Manifest::kInvalidOrMissingColor),
       background_color(content::Manifest::kInvalidOrMissingColor),
       ideal_splash_image_size_in_px(0),
       minimum_splash_image_size_in_px(0) {}
 
 ShortcutInfo::ShortcutInfo(const ShortcutInfo& other) = default;
 
 ShortcutInfo::~ShortcutInfo() {
 }
 
 void ShortcutInfo::UpdateFromManifest(const content::Manifest& manifest) {
-  if (!manifest.short_name.is_null())
+  if (!manifest.short_name.string().empty() ||
+      !manifest.name.string().empty()) {
     short_name = manifest.short_name.string();
-  if (!manifest.name.is_null())
     name = manifest.name.string();
-  if (manifest.short_name.is_null() != manifest.name.is_null()) {
-    if (manifest.short_name.is_null())
+    if (short_name.empty())
       short_name = name;
-    else
+    else if (name.empty())
       name = short_name;
   }
   user_title = short_name;
 
   // Set the url based on the manifest value, if any.
   if (manifest.start_url.is_valid())
     url = manifest.start_url;
 
   if (manifest.scope.is_valid())
     scope = manifest.scope;
@@ skipping 32 matching lines @@
 
   // Set the icon urls based on the icons in the manifest, if any.
   icon_urls.clear();
   for (const content::Manifest::Icon& icon : manifest.icons)
     icon_urls.push_back(icon.src.spec());
 }
 
 void ShortcutInfo::UpdateSource(const Source new_source) {
   source = new_source;
 }