Merge WebappInfo and WebApkMetaData part 1/2

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkMetaDataUtils.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.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
@@ skipping 12 matching lines @@
 /**
  * Contains methods for extracting meta data from WebAPK.
  */
 public class WebApkMetaDataUtils {
     /**
      * Populates {@link WebappInfo} with meta data extracted from WebAPK's Android Manifest.
      * @param webApkPackageName Package name of the WebAPK to extract meta data from.
      * @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;
 
         PackageManager packageManager = ContextUtils.getApplicationContext().getPackageManager();
         Resources resources;
         try {
             resources = packageManager.getResourcesForApplication(webApkPackageName);
         } catch (PackageManager.NameNotFoundException e) {
             return null;
         }
         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);
     }
 
     /**
      * Populates {@link WebApkMetaData} with meta data extracted from WebAPK's Android Manifest.
      * @param webApkPackageName Package name of the WebAPK to extract meta data from.
      */
     public static WebApkMetaData extractMetaDataFromWebApk(String webApkPackageName) {
@@ skipping 124 matching lines @@
             return ScreenOrientationValues.PORTRAIT;
         } else if (orientation.equals("portrait-primary")) {
             return ScreenOrientationValues.PORTRAIT_PRIMARY;
         } else if (orientation.equals("portrait-secondary")) {
             return ScreenOrientationValues.PORTRAIT_SECONDARY;
         } else {
             return ScreenOrientationValues.DEFAULT;
         }
     }
 }