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

chrome/browser/android/shortcut_info_unittest.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"
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/common/manifest.h"
@@ skipping 44 matching lines @@
 }
 
 TEST_F(ShortcutInfoTest, UserTitleBecomesShortName) {
   manifest_.short_name =
       base::NullableString16(base::ASCIIToUTF16("name"), false);
   info_.user_title = base::ASCIIToUTF16("title");
   info_.UpdateFromManifest(manifest_);
 
   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);
+}