webapps: propogate name and shortName from manifest to Java

chrome/browser/android/shortcut_info.cc

Index: chrome/browser/android/shortcut_info.cc
diff --git a/chrome/browser/android/shortcut_info.cc b/chrome/browser/android/shortcut_info.cc
index 67e0c5549c344667fdc39db4fc854bd8da65ea7d..e19fefd4ec39bb4b0187bc11aeb04c32a3fbb0e7 100644
--- a/chrome/browser/android/shortcut_info.cc
+++ b/chrome/browser/android/shortcut_info.cc
@@ -18,10 +18,15 @@ ShortcutInfo::ShortcutInfo(const GURL& shortcut_url)
 }
 
 void ShortcutInfo::UpdateFromManifest(const content::Manifest& manifest) {
-  if (!manifest.short_name.is_null())
-    title = manifest.short_name.string();
-  else if (!manifest.name.is_null())
-    title = manifest.name.string();
+  if (!manifest.name.is_null()) {
+    name = manifest.name.string();
+    user_title = name;
+  }
+
+  if (!manifest.short_name.is_null()) {
+    short_name = manifest.short_name.string();
+    user_title = short_name;
+  }

[mlamouri (slow - plz ping), 2015/07/09 16:34:17]

That means we might end up with short_name or name not being define. I think it
might be better if when one is missing, we set it with the other one so when the
intent information are used, the consumer do not have to worry about fallback.

 
   // Set the url based on the manifest value, if any.
   if (manifest.start_url.is_valid())