Store standalone web app data in WebappDataStorage as well as the homescreen intent.

chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappActivityTestBase.java

 // 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.
 
 package org.chromium.chrome.browser.webapps;
 
 import android.content.Intent;
 import android.net.Uri;
 import android.view.ViewGroup;
 
@@ skipping 10 matching lines @@
 import java.util.concurrent.TimeoutException;
 
 /**
  * The base class of the WebappActivity tests. It provides the common methods to access the activity
  * UI.  This particular test base only instantiates WebappActivity0.
  */
 public abstract class WebappActivityTestBase extends ChromeActivityTestCaseBase<WebappActivity0> {
     static final String WEBAPP_ID = "webapp_id";
     static final String WEBAPP_NAME = "webapp name";
     static final String WEBAPP_SHORT_NAME = "webapp short name";
-    static final String WEBAPP_URL = "https://www.google.com";
 
     // Empty 192x192 image generated with:
     // ShortcutHelper.encodeBitmapAsString(Bitmap.createBitmap(192, 192, Bitmap.Config.ARGB_4444));
     protected static final String TEST_ICON =
             "iVBORw0KGgoAAAANSUhEUgAAAMAAAADACAYAAABS3GwHAAAABHNCSVQICAgIfAhkiAAAAKZJREFU"
             + "eJztwTEBAAAAwqD1T20JT6AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
             + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
             + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4GQN4AAe3mX6IA"
             + "AAAASUVORK5CYII=";
 
@@ skipping 43 matching lines @@
         return intent;
     }
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
 
         // Register the webapp so when the data storage is opened, the test doesn't crash. There is
         // no race condition with the retrival as AsyncTasks are run sequentially on the background
         // thread.
-        WebappRegistry.registerWebapp(getInstrumentation().getTargetContext(),
-                WEBAPP_ID, WEBAPP_URL);
+        WebappRegistry.registerWebapp(getInstrumentation().getTargetContext(), WEBAPP_ID)
+                .updateFromShortcutIntent(createIntent());
     }
 
     /**
      * Starts up the WebappActivity and sets up the test observer.
      */
     protected final void startWebappActivity() throws Exception {
         startWebappActivity(createIntent());
     }
 
     /**
@@ skipping 100 matching lines @@
             fail();
         }
 
         ViewGroup splashScreen = getActivity().getSplashScreenForTests();
         if (splashScreen == null) {
             fail("No splash screen available.");
         }
         return splashScreen;
     }
 }