Merge WebappInfo and WebApkMetaData part 1/2

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

Index: chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkMetaDataUtils.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkMetaDataUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkMetaDataUtils.java
index 2eac6f09e07a8c5d8d1ec7b1fb5990d5abc1231b..bfe11ea07f448d7f86bdd86b4d4051ed6020ecd1 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkMetaDataUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkMetaDataUtils.java
@@ -30,7 +30,7 @@ public class WebApkMetaDataUtils {
      * @param url WebAPK start URL.
      * @param source {@link ShortcutSource} that the WebAPK was opened from.
      */
-    public static WebappInfo extractWebappInfoFromWebApk(
+    public static WebApkInfo extractWebappInfoFromWebApk(
             String webApkPackageName, String url, int source) {
         WebApkMetaData metaData = extractMetaDataFromWebApk(webApkPackageName);
         if (metaData == null) return null;
@@ -45,7 +45,7 @@ public class WebApkMetaDataUtils {
         Bitmap icon = BitmapFactory.decodeResource(resources, metaData.iconId);
         String encodedIcon = ShortcutHelper.encodeBitmapAsString(icon);
 
-        return WebappInfo.create(WebApkConstants.WEBAPK_ID_PREFIX + webApkPackageName, url,
+        return WebApkInfo.create(WebApkConstants.WEBAPK_ID_PREFIX + webApkPackageName, url,
                 metaData.scope, encodedIcon, metaData.name, metaData.shortName,
                 metaData.displayMode, metaData.orientation, source, metaData.themeColor,
                 metaData.backgroundColor, TextUtils.isEmpty(metaData.iconUrl), webApkPackageName);