Merge WebappInfo and WebApkMetaData part 1/2

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java

 // Copyright 2016 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 org.chromium.base.ContextUtils;
 import org.chromium.base.library_loader.LibraryProcessType;
@@ skipping 29 matching lines @@
         // navigate to.
         String overrideUrl = intent.getStringExtra(ShortcutHelper.EXTRA_URL);
         if (overrideUrl != null && isInitialized()
                 && !overrideUrl.equals(getActivityTab().getUrl())) {
             getActivityTab().loadUrl(
                     new LoadUrlParams(overrideUrl, PageTransition.AUTO_TOPLEVEL));
         }
     }
 
     @Override
+    protected WebappInfo createWebappInfo(Intent intent) {
+        return (intent == null) ? WebApkInfo.createEmpty() : WebApkInfo.create(intent);
+    }
+
+    @Override
     protected void onStorageIsNull(final int backgroundColor) {
         // Register the WebAPK. It is possible that a WebAPK's meta data was deleted when user
         // cleared Chrome's data. When it is launched again, we know that the WebAPK is still
         // installed, so re-register it.
         WebappRegistry.getInstance().register(
                 mWebappInfo.id(), new WebappRegistry.FetchWebappDataStorageCallback() {
                     @Override
                     public void onWebappDataStorageRetrieved(WebappDataStorage storage) {
                         updateStorage(storage);
                         // Initialize the time of the last is-update-needed check with the
@@ skipping 71 matching lines @@
         // TODO(hanxi): crbug.com/611842. Investigates whether this function works for multiple
         // windows or with --site-per-process enabled.
         initializeChildProcessCreationParams(true);
     }
 
     @Override
     public void onDeferredStartup() {
         super.onDeferredStartup();
 
         mUpdateManager = new WebApkUpdateManager();
-        mUpdateManager.updateIfNeeded(getActivityTab(), mWebappInfo);
+        mUpdateManager.updateIfNeeded(getActivityTab(), (WebApkInfo) mWebappInfo);
     }
 
     @Override
     public void onPause() {
         super.onPause();
         initializeChildProcessCreationParams(false);
     }
 
     /**
      * Initializes {@link ChildProcessCreationParams} as a WebAPK's renderer process if
@@ skipping 13 matching lines @@
     }
 
     @Override
     protected void onDestroyInternal() {
         if (mUpdateManager != null) {
             mUpdateManager.destroy();
         }
         super.onDestroyInternal();
     }
 }