webapps: introduce helper class to store extended set of data

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

 // Copyright 2015 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 android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.net.Uri;
-import android.text.TextUtils;
-import android.util.Base64;
 import android.util.Log;
 
 import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.chrome.browser.ShortcutSource;
 import org.chromium.chrome.browser.util.IntentUtils;
 import org.chromium.content_public.common.ScreenOrientationValues;
 
 /**
  * Stores info about a web app.
  */
@@ skipping 167 matching lines @@
     // This is needed for clients that want to send the icon trough an intent.
     public String encodedIcon() {
         return mEncodedIcon;
     }
 
     /**
      * Returns the icon in Bitmap form.  Caches the result for future retrievals.
      */
     public Bitmap icon() {
         if (mDecodedIcon != null) return mDecodedIcon;
-        if (TextUtils.isEmpty(mEncodedIcon)) return null;
-
-        byte[] decoded = Base64.decode(mEncodedIcon, Base64.DEFAULT);
-        mDecodedIcon = BitmapFactory.decodeByteArray(decoded, 0, decoded.length);
+        mDecodedIcon = ShortcutHelper.decodeBitmapFromString(mEncodedIcon);
         return mDecodedIcon;
     }
 
     /**
      * Sets extras on an Intent that will launch a WebappActivity.
      * @param intent Intent that will be used to launch a WebappActivity.
      */
     public void setWebappIntentExtras(Intent intent) {
         intent.putExtra(ShortcutHelper.EXTRA_ID, id());
         intent.putExtra(ShortcutHelper.EXTRA_URL, uri().toString());
         intent.putExtra(ShortcutHelper.EXTRA_ICON, encodedIcon());
         intent.putExtra(ShortcutHelper.EXTRA_NAME, name());
         intent.putExtra(ShortcutHelper.EXTRA_SHORT_NAME, shortName());
         intent.putExtra(ShortcutHelper.EXTRA_ORIENTATION, orientation());
         intent.putExtra(ShortcutHelper.EXTRA_SOURCE, source());
         intent.putExtra(ShortcutHelper.EXTRA_THEME_COLOR, themeColor());
         intent.putExtra(ShortcutHelper.EXTRA_BACKGROUND_COLOR, backgroundColor());
     }
 }