Merge WebappInfo and WebApkMetaData part 1/2

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

Index: chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java
index 4e438cd4d26c2c78985d5b73f41a9aff076f8f48..4129b2db7e5688da19f66595b9012ce5a5cd5032 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java
@@ -47,6 +47,11 @@ public class WebApkActivity extends WebappActivity {
     }
 
     @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
@@ -138,7 +143,7 @@ public class WebApkActivity extends WebappActivity {
         super.onDeferredStartup();
 
         mUpdateManager = new WebApkUpdateManager();
-        mUpdateManager.updateIfNeeded(getActivityTab(), mWebappInfo);
+        mUpdateManager.updateIfNeeded(getActivityTab(), (WebApkInfo) mWebappInfo);
     }
 
     @Override