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

chrome/browser/android/shortcut_info_unittest.cc

Index: chrome/browser/android/shortcut_info_unittest.cc
diff --git a/chrome/browser/android/shortcut_info_unittest.cc b/chrome/browser/android/shortcut_info_unittest.cc
index 86826ed29292bc2313f0177a0d1ad033a6b9a83d..3dab27ccc641437a0a4c2d412825e8a6462b4f9b 100644
--- a/chrome/browser/android/shortcut_info_unittest.cc
+++ b/chrome/browser/android/shortcut_info_unittest.cc
@@ -62,3 +62,20 @@ TEST_F(ShortcutInfoTest, UserTitleBecomesShortName) {
 
   ASSERT_EQ(manifest_.short_name.string(), info_.user_title);
 }
+
+// Test that if a manifest with an empty name and empty short_name is passed,
+// that ShortcutInfo::UpdateFromManifest() does not overwrite the current
+// ShortcutInfo::name and ShortcutInfo::short_name.
+TEST_F(ShortcutInfoTest, IgnoreEmptyNameAndShortName) {
+  base::string16 initial_name(base::ASCIIToUTF16("initial_name"));
+  base::string16 initial_short_name(base::ASCIIToUTF16("initial_short_name"));
+
+  info_.name = initial_name;
+  info_.short_name = initial_short_name;
+  manifest_.display = blink::kWebDisplayModeStandalone;
+  manifest_.name = base::NullableString16(base::string16(), false);
+  info_.UpdateFromManifest(manifest_);
+
+  ASSERT_EQ(initial_name, info_.name);
+  ASSERT_EQ(initial_short_name, info_.short_name);
+}