Move validity checks from WebappInfo#create() to WebappInfo() constructor

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

Index: chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappInfo.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappInfo.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappInfo.java
index 5a2c9de1dced4259d4a9d8348be29644e7094f14..fcdfa88a26e1bbb8f934df5e6d44e63dc5e172d6 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappInfo.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappInfo.java
@@ -7,8 +7,8 @@ package org.chromium.chrome.browser.webapps;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.net.Uri;
-import android.util.Log;
 
+import org.chromium.base.Log;
 import org.chromium.blink_public.platform.WebDisplayMode;
 import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.chrome.browser.ShortcutSource;
@@ -19,6 +19,8 @@ import org.chromium.content_public.common.ScreenOrientationValues;
  * Stores info about a web app.
  */
 public class WebappInfo {
+    private static final String TAG = "WebappInfo";
+
     private boolean mIsInitialized;
     private String mId;
     private String mEncodedIcon;
@@ -86,8 +88,9 @@ public class WebappInfo {
         String webApkPackageName = IntentUtils.safeGetStringExtra(intent,
                 ShortcutHelper.EXTRA_WEBAPK_PACKAGE_NAME);
 
-        return create(id, url, scope, icon, name, shortName, displayMode, orientation, source,
-                themeColor, backgroundColor, isIconGenerated, webApkPackageName);
+        WebappInfo info = create(id, url, scope, icon, name, shortName, displayMode, orientation,
+                source, themeColor, backgroundColor, isIconGenerated, webApkPackageName);
+        return info.isInitialized() ? info : null;
     }
 
     /**
@@ -110,11 +113,6 @@ public class WebappInfo {
     public static WebappInfo create(String id, String url, String scope, String icon, String name,
             String shortName, int displayMode, int orientation, int source, long themeColor,
             long backgroundColor, boolean isIconGenerated, String webApkPackageName) {
-        if (id == null || url == null) {
-            Log.e("WebappInfo", "Data passed in was incomplete: " + id + ", " + url);
-            return null;
-        }
-
         Uri uri = Uri.parse(url);
         if (scope == null || scope.isEmpty()) {
             scope = ShortcutHelper.getScopeFromUrl(url);
@@ -140,8 +138,12 @@ public class WebappInfo {
         mThemeColor = themeColor;
         mBackgroundColor = backgroundColor;
         mIsIconGenerated = isIconGenerated;
-        mIsInitialized = mUri != null;
         mWebApkPackageName = webApkPackageName;
+
+        mIsInitialized = (mId != null && mUri != null);
+        if (!mIsInitialized) {
+            Log.e(TAG, "Data passed in was incomplete: " + mId + ", " + mUri.toString());
+        }
     }
 
     private WebappInfo() {