Store URLs in WebappDataStorage, and purge them when history is cleared.

chrome/browser/android/shortcut_helper.cc

Index: chrome/browser/android/shortcut_helper.cc
diff --git a/chrome/browser/android/shortcut_helper.cc b/chrome/browser/android/shortcut_helper.cc
index 6c85072f38c834ef6ca36d814e37654d94ec76c1..54f7ecf4eab8ece85fa1fa76e43ebee7d306ea39 100644
--- a/chrome/browser/android/shortcut_helper.cc
+++ b/chrome/browser/android/shortcut_helper.cc
@@ -132,16 +132,16 @@ void ShortcutHelper::FetchSplashScreenImage(
   // This is a fire and forget task. It is not vital for the splash screen image
   // to be downloaded so if the downloader returns false there is no fallback.
   ManifestIconDownloader::Download(
-      web_contents,
-      image_url,
-      ideal_splash_image_size_in_dp,
+      web_contents, image_url, ideal_splash_image_size_in_dp,
       minimum_splash_image_size_in_dp,
-      base::Bind(&ShortcutHelper::StoreWebappData, webapp_id));
+      base::Bind(&ShortcutHelper::StoreWebappData, webapp_id,
+                 web_contents->GetLastCommittedURL().GetOrigin().spec()));

[mlamouri (slow - plz ping), 2016/03/16 13:34:28]

I don't think that's a good idea to use the top frame url's origin. Ideally, we
should probably use ShortcutInfo.url because this is where the shortcut will
point to and that will guarantee a consistency.

[dominickn, 2016/03/17 04:31:26]

Done.

 }
 
 // static
 void ShortcutHelper::StoreWebappData(
     const std::string& webapp_id,
+    const std::string& origin_url,
     const SkBitmap& splash_image) {
   if (splash_image.drawsNothing())
     return;
@@ -149,6 +149,8 @@ void ShortcutHelper::StoreWebappData(
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> java_webapp_id =
       base::android::ConvertUTF8ToJavaString(env, webapp_id);
+  ScopedJavaLocalRef<jstring> java_origin_url =
+      base::android::ConvertUTF8ToJavaString(env, origin_url);
   ScopedJavaLocalRef<jobject> java_splash_image =
       gfx::ConvertToJavaBitmap(&splash_image);
 
@@ -156,6 +158,7 @@ void ShortcutHelper::StoreWebappData(
       env,
       base::android::GetApplicationContext(),
       java_webapp_id.obj(),
+      java_origin_url.obj(),
       java_splash_image.obj());
 }