Improving code readability/sharing by reusing conversion consts

Change-Id: Icafc3b1ba9214723ace644f9cfa6f3e89a28897d
Reviewed-on: https://chromium-review.googlesource.com/1089337Reviewed-by: Theresa <twellington@chromium.org>
Reviewed-by: Tommy Nyquist <nyquist@chromium.org>
Reviewed-by: Maria Khomenko <mariakhomenko@chromium.org>
Commit-Queue: Marcin Wiącek <marcin@mwiacek.com>
Cr-Commit-Position: refs/heads/master@{#565416}

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java

@@ -26,6 +26,7 @@ import org.chromium.chrome.browser.favicon.LargeIconBridge;
 import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksReader;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.snackbar.SnackbarManager;
+import org.chromium.chrome.browser.util.ConversionUtils;
 import org.chromium.chrome.browser.widget.selection.SelectableListLayout;
 import org.chromium.chrome.browser.widget.selection.SelectableListToolbar.SearchDelegate;
 import org.chromium.chrome.browser.widget.selection.SelectionDelegate;
@@ -40,7 +41,8 @@ import java.util.Stack;
  */
 public class BookmarkManager implements BookmarkDelegate, SearchDelegate,
                                         PartnerBookmarksReader.FaviconUpdateObserver {
-    private static final int FAVICON_MAX_CACHE_SIZE_BYTES = 10 * 1024 * 1024; // 10MB
+    private static final int FAVICON_MAX_CACHE_SIZE_BYTES =
+            10 * ConversionUtils.BYTES_PER_MEGABYTE; // 10MB
 
     /**
      * This shared preference used to be used to save a list of recent searches. That feature
@@ -173,8 +175,9 @@ public class BookmarkManager implements BookmarkDelegate, SearchDelegate,
         mLargeIconBridge = new LargeIconBridge(Profile.getLastUsedProfile().getOriginalProfile());
         ActivityManager activityManager = ((ActivityManager) ContextUtils
                 .getApplicationContext().getSystemService(Context.ACTIVITY_SERVICE));
-        int maxSize = Math.min(activityManager.getMemoryClass() / 4 * 1024 * 1024,
-                FAVICON_MAX_CACHE_SIZE_BYTES);
+        int maxSize =
+                Math.min(activityManager.getMemoryClass() / 4 * ConversionUtils.BYTES_PER_MEGABYTE,
+                        FAVICON_MAX_CACHE_SIZE_BYTES);
         mLargeIconBridge.createCache(maxSize);
 
         RecordUserAction.record("MobileBookmarkManagerOpen");

chrome/android/java/src/org/chromium/chrome/browser/download/DownloadManagerService.java

@@ -40,6 +40,7 @@ import org.chromium.chrome.browser.media.MediaViewerUtils;
 import org.chromium.chrome.browser.preferences.Pref;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.util.ConversionUtils;
 import org.chromium.chrome.browser.util.FeatureUtilities;
 import org.chromium.components.download.DownloadState;
 import org.chromium.components.feature_engagement.EventConstants;
@@ -109,8 +110,6 @@ public class DownloadManagerService
     private static final int UMA_DOWNLOAD_RESUMPTION_AUTO_STARTED = 4;
     private static final int UMA_DOWNLOAD_RESUMPTION_COUNT = 5;
 
-    private static final int GB_IN_KILO_BYTES = 1024 * 1024;
-
     // Set will be more expensive to initialize, so use an ArrayList here.
     private static final List<String> MIME_TYPES_TO_OPEN = new ArrayList<String>(Arrays.asList(
             OMADownloadHandler.OMA_DOWNLOAD_DESCRIPTOR_MIME,
@@ -1161,14 +1160,14 @@ public class DownloadManagerService
                             totalDuration, TimeUnit.MILLISECONDS);
                     RecordHistogram.recordCount1000Histogram(
                             "MobileDownload.BytesDownloaded.DownloadManager.Success",
-                            (int) (bytesDownloaded / 1024));
+                            (int) ConversionUtils.bytesToKilobytes(bytesDownloaded));
                 } else {
                     RecordHistogram.recordLongTimesHistogram(
                             "MobileDownload.DownloadTime.ChromeNetworkStack.Success",
                             totalDuration, TimeUnit.MILLISECONDS);
                     RecordHistogram.recordCount1000Histogram(
                             "MobileDownload.BytesDownloaded.ChromeNetworkStack.Success",
-                            (int) (bytesDownloaded / 1024));
+                            (int) ConversionUtils.bytesToKilobytes(bytesDownloaded));
                     RecordHistogram.recordCountHistogram(
                             "MobileDownload.InterruptionsCount.ChromeNetworkStack.Success",
                             numInterruptions);
@@ -1183,14 +1182,14 @@ public class DownloadManagerService
                             totalDuration, TimeUnit.MILLISECONDS);
                     RecordHistogram.recordCount1000Histogram(
                             "MobileDownload.BytesDownloaded.DownloadManager.Failure",
-                            (int) (bytesDownloaded / 1024));
+                            (int) ConversionUtils.bytesToKilobytes(bytesDownloaded));
                 } else {
                     RecordHistogram.recordLongTimesHistogram(
                             "MobileDownload.DownloadTime.ChromeNetworkStack.Failure",
                             totalDuration, TimeUnit.MILLISECONDS);
                     RecordHistogram.recordCount1000Histogram(
                             "MobileDownload.BytesDownloaded.ChromeNetworkStack.Failure",
-                            (int) (bytesDownloaded / 1024));
+                            (int) ConversionUtils.bytesToKilobytes(bytesDownloaded));
                     RecordHistogram.recordCountHistogram(
                             "MobileDownload.InterruptionsCount.ChromeNetworkStack.Failure",
                             numInterruptions);
@@ -1221,8 +1220,9 @@ public class DownloadManagerService
      * @param bytesWasted Bytes wasted during download.
      */
     private void recordBytesWasted(String name, long bytesWasted) {
-        RecordHistogram.recordCustomCountHistogram(
-                name, (int) (bytesWasted / 1024), 1, GB_IN_KILO_BYTES, 50);
+        RecordHistogram.recordCustomCountHistogram(name,
+                (int) ConversionUtils.bytesToKilobytes(bytesWasted), 1,
+                ConversionUtils.KILOBYTES_PER_GIGABYTE, 50);
     }
 
     @Override

chrome/android/java/src/org/chromium/chrome/browser/favicon/LargeIconBridge.java

@@ -11,6 +11,7 @@ import android.util.LruCache;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.util.ConversionUtils;
 
 /**
  * A Java API for using the C++ LargeIconService.
@@ -18,8 +19,7 @@ import org.chromium.chrome.browser.profiles.Profile;
  * An instance of this class must be created, used, and destroyed on the same thread.
  */
 public class LargeIconBridge {
-
-    private static final int CACHE_ENTRY_MIN_SIZE_BYTES = 1024;
+    private static final int CACHE_ENTRY_MIN_SIZE_BYTES = ConversionUtils.BYTES_PER_KILOBYTE;
     private final Profile mProfile;
     private long mNativeLargeIconBridge;
     private LruCache<String, CachedFavicon> mFaviconCache;

chrome/android/java/src/org/chromium/chrome/browser/feedback/HistogramFeedbackSource.java

@@ -10,6 +10,7 @@ import org.chromium.base.SysUtils;
 import org.chromium.base.metrics.JSONVerbosityLevel;
 import org.chromium.base.metrics.StatisticsRecorderAndroid;
 import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.util.ConversionUtils;
 
 /** Grabs feedback about the UMA histograms. */
 // TODO(dtrainor): Make this class protected and HISTOGRAMS_KEY private once grabbing specific log
@@ -19,7 +20,8 @@ public class HistogramFeedbackSource implements FeedbackSource {
 
     // Minimum physical memory (in KB) required on the device to get a dump of the buckets.
     // Currently, it is required that the physical memory be more than 2 GB.
-    private static final int MIN_PHYSICAL_MEMORY_KB = 2 * 1024 * 1024 + 1;
+    private static final int MIN_PHYSICAL_MEMORY_KB =
+            2 * ConversionUtils.KILOBYTES_PER_GIGABYTE + 1;
 
     private final boolean mIsOffTheRecord;
 

chrome/android/java/src/org/chromium/chrome/browser/feedback/SystemInfoFeedbackSource.java

@@ -13,6 +13,7 @@ import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.CollectionUtil;
 import org.chromium.base.LocaleUtils;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.chrome.browser.util.ConversionUtils;
 
 import java.io.File;
 import java.util.Map;
@@ -43,9 +44,10 @@ public class SystemInfoFeedbackSource extends AsyncFeedbackSourceAdapter<StatFs>
         StatFs statFs = getResult();
         if (statFs != null) {
             long blockSize = ApiCompatibilityUtils.getBlockSize(statFs);
-            long availSpace =
-                    ApiCompatibilityUtils.getAvailableBlocks(statFs) * blockSize / 1024 / 1024;
-            long totalSpace = ApiCompatibilityUtils.getBlockCount(statFs) * blockSize / 1024 / 1024;
+            long availSpace = ConversionUtils.bytesToMegabytes(
+                    ApiCompatibilityUtils.getAvailableBlocks(statFs) * blockSize);
+            long totalSpace = ConversionUtils.bytesToMegabytes(
+                    ApiCompatibilityUtils.getBlockCount(statFs) * blockSize);
 
             feedback.put("Available Storage (MB)", Long.toString(availSpace));
             feedback.put("Total Storage (MB)", Long.toString(totalSpace));

chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java

@@ -42,6 +42,7 @@ import org.chromium.chrome.browser.snackbar.SnackbarManager;
 import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarController;
 import org.chromium.chrome.browser.tabmodel.TabCreatorManager.TabCreator;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
+import org.chromium.chrome.browser.util.ConversionUtils;
 import org.chromium.chrome.browser.util.IntentUtils;
 import org.chromium.chrome.browser.widget.selection.SelectableListLayout;
 import org.chromium.chrome.browser.widget.selection.SelectableListToolbar.SearchDelegate;
@@ -59,8 +60,8 @@ import java.util.List;
 public class HistoryManager implements OnMenuItemClickListener, SignInStateObserver,
                                        SelectionObserver<HistoryItem>, SearchDelegate,
                                        SnackbarController, PrefObserver {
-    private static final int FAVICON_MAX_CACHE_SIZE_BYTES = 10 * 1024 * 1024; // 10MB
-    private static final int MEGABYTES_TO_BYTES =  1024 * 1024;
+    private static final int FAVICON_MAX_CACHE_SIZE_BYTES =
+            10 * ConversionUtils.BYTES_PER_MEGABYTE; // 10MB
     private static final String METRICS_PREFIX = "Android.HistoryPage.";
     private static final String PREF_SHOW_HISTORY_INFO = "history_home_show_info";
 
@@ -137,7 +138,8 @@ public class HistoryManager implements OnMenuItemClickListener, SignInStateObser
         mLargeIconBridge = new LargeIconBridge(Profile.getLastUsedProfile().getOriginalProfile());
         ActivityManager activityManager = ((ActivityManager) ContextUtils
                 .getApplicationContext().getSystemService(Context.ACTIVITY_SERVICE));
-        int maxSize = Math.min((activityManager.getMemoryClass() / 4) * MEGABYTES_TO_BYTES,
+        int maxSize = Math.min(
+                (activityManager.getMemoryClass() / 4) * ConversionUtils.BYTES_PER_MEGABYTE,
                 FAVICON_MAX_CACHE_SIZE_BYTES);
         mLargeIconBridge.createCache(maxSize);
 

chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java

@@ -68,6 +68,7 @@ import org.chromium.chrome.browser.searchwidget.SearchWidgetProvider;
 import org.chromium.chrome.browser.services.GoogleServicesManager;
 import org.chromium.chrome.browser.share.ShareHelper;
 import org.chromium.chrome.browser.sync.SyncController;
+import org.chromium.chrome.browser.util.ConversionUtils;
 import org.chromium.chrome.browser.webapps.WebApkVersionManager;
 import org.chromium.chrome.browser.webapps.WebappRegistry;
 import org.chromium.components.background_task_scheduler.BackgroundTaskSchedulerFactory;
@@ -679,7 +680,7 @@ public class ProcessInitializationHandler {
                 if (!cacheFile.exists()) {
                     return null;
                 }
-                long cacheFileSizeKb = cacheFile.length() / 1024;
+                long cacheFileSizeKb = ConversionUtils.bytesToKilobytes(cacheFile.length());
                 // Clamp size to [minFileSizeKb, maxFileSizeKb). This also guarantees that the
                 // int-cast below is safe.
                 if (cacheFileSizeKb < MIN_CACHE_FILE_SIZE_KB) {

chrome/android/java/src/org/chromium/chrome/browser/metrics/PackageMetrics.java

@@ -17,6 +17,7 @@ import android.os.storage.StorageVolume;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.metrics.RecordHistogram;
+import org.chromium.chrome.browser.util.ConversionUtils;
 
 import java.io.IOException;
 import java.util.UUID;
@@ -83,11 +84,11 @@ public class PackageMetrics {
         PackageMetricsData data = getPackageStatsForAndroidO();
         if (data != null) {
             RecordHistogram.recordCustomCountHistogram("Android.PackageStats.DataSize",
-                    Math.round(data.dataSize / 1024 / 1024), 1, 10000, 50);
+                    Math.round(ConversionUtils.bytesToMegabytes(data.dataSize)), 1, 10000, 50);
             RecordHistogram.recordCustomCountHistogram("Android.PackageStats.CacheSize",
-                    Math.round(data.cacheSize / 1024 / 1024), 1, 10000, 50);
-            RecordHistogram.recordSparseSlowlyHistogram(
-                    "Android.PackageStats.CodeSize", Math.round(data.codeSize / 1024 / 1024));
+                    Math.round(ConversionUtils.bytesToMegabytes(data.cacheSize)), 1, 10000, 50);
+            RecordHistogram.recordSparseSlowlyHistogram("Android.PackageStats.CodeSize",
+                    Math.round(ConversionUtils.bytesToMegabytes(data.codeSize)));
         }
     }
 }

chrome/android/java/src/org/chromium/chrome/browser/metrics/WebApkUma.java

@@ -19,6 +19,7 @@ import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.preferences.website.SiteSettingsCategory;
 import org.chromium.chrome.browser.preferences.website.Website;
 import org.chromium.chrome.browser.preferences.website.WebsitePermissionsFetcher;
+import org.chromium.chrome.browser.util.ConversionUtils;
 import org.chromium.webapk.lib.common.WebApkConstants;
 
 import java.io.File;
@@ -318,7 +319,7 @@ public class WebApkUma {
     }
 
     private static int roundByteToMb(long bytes) {
-        int mbs = (int) (bytes / 1024L / 1024L / 10L * 10L);
+        int mbs = (int) (bytes / (long) ConversionUtils.BYTES_PER_MEGABYTE / 10L * 10L);
         return Math.min(1000, Math.max(-1000, mbs));
     }
 
@@ -367,7 +368,7 @@ public class WebApkUma {
             webApkExtraSpaceBytes = ChromeFeatureList.getFieldTrialParamByFeatureAsInt(
                                             ChromeFeatureList.ADJUST_WEBAPK_INSTALLATION_SPACE,
                                             ADJUST_WEBAPK_INSTALLATION_SPACE_PARAM, 0)
-                    * 1024L * 1024L;
+                    * (long) ConversionUtils.BYTES_PER_MEGABYTE;
         }
 
         return partitionAvailableBytes - minimumFreeBytes + webApkExtraSpaceBytes;
@@ -387,7 +388,7 @@ public class WebApkUma {
         // Copied from android/os/storage/StorageManager.java
         final int defaultThresholdPercentage = 10;
         // Copied from android/os/storage/StorageManager.java
-        final long defaultThresholdMaxBytes = 500 * 1024 * 1024;
+        final long defaultThresholdMaxBytes = 500 * ConversionUtils.BYTES_PER_MEGABYTE;
         // Copied from android/provider/Settings.java
         final String sysStorageThresholdPercentage = "sys_storage_threshold_percentage";
         // Copied from android/provider/Settings.java

chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java

@@ -33,6 +33,7 @@ import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.appmenu.AppMenu;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
+import org.chromium.chrome.browser.util.ConversionUtils;
 import org.chromium.components.variations.VariationsAssociatedData;
 import org.chromium.ui.interpolators.BakedBezierInterpolator;
 
@@ -434,13 +435,13 @@ public class UpdateMenuItemHelper {
 
     @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
     private static long getSizeUpdatedApi(StatFs statFs) {
-        return statFs.getAvailableBytes() / (1024 * 1024);
+        return ConversionUtils.bytesToMegabytes(statFs.getAvailableBytes());
     }
 
     @SuppressWarnings("deprecation")
     private static long getSize(StatFs statFs) {
         int blockSize = statFs.getBlockSize();
         int availableBlocks = statFs.getAvailableBlocks();
-        return (blockSize * availableBlocks) / (1024 * 1024);
+        return ConversionUtils.bytesToMegabytes(blockSize * availableBlocks);
     }
 }

chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionProxyUma.java

@@ -5,6 +5,7 @@
 package org.chromium.chrome.browser.preferences.datareduction;
 
 import org.chromium.base.metrics.RecordHistogram;
+import org.chromium.chrome.browser.util.ConversionUtils;
 
 /**
  * Centralizes UMA data collection for the Data Reduction Proxy.
@@ -92,10 +93,11 @@ public class DataReductionProxyUma {
             long compressedTotalBytes, long originalTotalBytes) {
         // The byte counts are stored in KB. The largest histogram bucket is set to ~1 TB.
         RecordHistogram.recordCustomCountHistogram(USER_VIEWED_ORIGINAL_SIZE_HISTOGRAM_NAME,
-                (int) (originalTotalBytes / 1024), 1, 1000 * 1000 * 1000, 100);
-        RecordHistogram.recordCustomCountHistogram(USER_VIEWED_SAVINGS_SIZE_HISTOGRAM_NAME,
-                (int) ((originalTotalBytes - compressedTotalBytes) / 1024), 1, 1000 * 1000 * 1000,
+                (int) ConversionUtils.bytesToKilobytes(originalTotalBytes), 1, 1000 * 1000 * 1000,
                 100);
+        RecordHistogram.recordCustomCountHistogram(USER_VIEWED_SAVINGS_SIZE_HISTOGRAM_NAME,
+                (int) ConversionUtils.bytesToKilobytes(originalTotalBytes - compressedTotalBytes),
+                1, 1000 * 1000 * 1000, 100);
     }
 
     /**

chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ConfirmImportantSitesDialogFragment.java

@@ -34,6 +34,7 @@ import org.chromium.chrome.browser.favicon.IconType;
 import org.chromium.chrome.browser.favicon.LargeIconBridge;
 import org.chromium.chrome.browser.favicon.LargeIconBridge.LargeIconCallback;
 import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.util.ConversionUtils;
 import org.chromium.chrome.browser.util.ViewUtils;
 import org.chromium.chrome.browser.widget.RoundedIconGenerator;
 
@@ -166,7 +167,8 @@ public class ConfirmImportantSitesDialogFragment extends DialogFragment {
         return dialogFragment;
     }
 
-    private static final int FAVICON_MAX_CACHE_SIZE_BYTES = 100 * 1024; // 100KB
+    private static final int FAVICON_MAX_CACHE_SIZE_BYTES =
+            100 * ConversionUtils.BYTES_PER_KILOBYTE; // 100KB
 
     /** The tag used when showing the clear browsing fragment. */
     public static final String FRAGMENT_TAG = "ConfirmImportantSitesDialogFragment";
@@ -270,7 +272,8 @@ public class ConfirmImportantSitesDialogFragment extends DialogFragment {
                 ((ActivityManager) ContextUtils.getApplicationContext().getSystemService(
                         Context.ACTIVITY_SERVICE));
         int maxSize = Math.min(
-                activityManager.getMemoryClass() / 16 * 25 * 1024, FAVICON_MAX_CACHE_SIZE_BYTES);
+                activityManager.getMemoryClass() / 16 * 25 * ConversionUtils.BYTES_PER_KILOBYTE,
+                FAVICON_MAX_CACHE_SIZE_BYTES);
         mLargeIconBridge.createCache(maxSize);
 
         mAdapter = new ClearBrowsingDataAdapter(mImportantDomains, mFaviconURLs, getResources());

chrome/android/java/src/org/chromium/chrome/browser/snackbar/DataReductionPromoSnackbarController.java

@@ -13,6 +13,7 @@ import org.chromium.chrome.browser.preferences.PreferencesLauncher;
 import org.chromium.chrome.browser.preferences.datareduction.DataReductionPreferences;
 import org.chromium.chrome.browser.preferences.datareduction.DataReductionPromoUtils;
 import org.chromium.chrome.browser.preferences.datareduction.DataReductionProxyUma;
+import org.chromium.chrome.browser.util.ConversionUtils;
 import org.chromium.components.variations.VariationsAssociatedData;
 
 /**
@@ -30,8 +31,6 @@ public class DataReductionPromoSnackbarController implements SnackbarManager.Sna
     public static final String PROMO_FIELD_TRIAL_NAME = "DataCompressionProxyPromoVisibility";
     private static final String ENABLE_DATA_REDUCTION_PROXY_SAVINGS_PROMO_SWITCH =
             "enable-data-reduction-proxy-savings-promo";
-    private static final long BYTES_PER_MEGABYTE = 1024 * 1024;
-    private static final long BYTES_PER_GIGABYTE = 1024 * 1024 * 1024;
 
     private final SnackbarManager mSnackbarManager;
     private final Context mContext;
@@ -95,7 +94,7 @@ public class DataReductionPromoSnackbarController implements SnackbarManager.Sna
         }
 
         for (int promoDataSavingsMB : mPromoDataSavingsMB) {
-            long promoDataSavingsBytes = promoDataSavingsMB * BYTES_PER_MEGABYTE;
+            long promoDataSavingsBytes = promoDataSavingsMB * ConversionUtils.BYTES_PER_MEGABYTE;
             if (promoDataSavingsMB > 0 && dataSavingsInBytes >= promoDataSavingsBytes
                     && DataReductionPromoUtils
                             .getDisplayedSnackbarPromoSavedBytes() < promoDataSavingsBytes) {
@@ -117,12 +116,12 @@ public class DataReductionPromoSnackbarController implements SnackbarManager.Sna
         int resourceId;
         int bytesInCorrectUnits;
 
-        if (bytes < BYTES_PER_GIGABYTE) {
+        if (bytes < ConversionUtils.BYTES_PER_GIGABYTE) {
             resourceId =  R.string.data_reduction_promo_snackbar_text_mb;
-            bytesInCorrectUnits = (int) (bytes / BYTES_PER_MEGABYTE);
+            bytesInCorrectUnits = (int) ConversionUtils.bytesToMegabytes(bytes);
         } else {
             resourceId =  R.string.data_reduction_promo_snackbar_text_gb;
-            bytesInCorrectUnits = (int) (bytes / BYTES_PER_GIGABYTE);
+            bytesInCorrectUnits = (int) ConversionUtils.bytesToGigabytes(bytes);
         }
 
         return mContext.getResources().getString(resourceId, bytesInCorrectUnits);

chrome/android/java/src/org/chromium/chrome/browser/util/ConversionUtils.java

@@ -11,6 +11,7 @@ public class ConversionUtils {
     public static final int BYTES_PER_KILOBYTE = 1024;
     public static final int BYTES_PER_MEGABYTE = 1024 * 1024;
     public static final int BYTES_PER_GIGABYTE = 1024 * 1024 * 1024;
+    public static final int KILOBYTES_PER_GIGABYTE = 1024 * 1024;
 
     public static long bytesToKilobytes(long bytes) {
         return bytes / BYTES_PER_KILOBYTE;

chrome/android/java/src/org/chromium/chrome/browser/util/FileSizeUtil.java

@@ -28,7 +28,7 @@ public class FileSizeUtil {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             // Only add spans for numbers which will be displayed as bytes. KB, MB etc are spoken
             // correctly by the TTS.
-            if (bytes / 1024 < 1) {
+            if (ConversionUtils.bytesToKilobytes(bytes) < 1) {
                 TtsSpan ttsSpan =
                         new TtsSpan.MeasureBuilder().setNumber(bytes).setUnit("byte").build();
                 Spannable phraseSpannable = new SpannableString(phrase);

chrome/android/java/src/org/chromium/chrome/browser/widget/ThumbnailDiskStorage.java

@@ -21,6 +21,7 @@ import org.chromium.base.Log;
 import org.chromium.base.StreamUtil;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
+import org.chromium.chrome.browser.util.ConversionUtils;
 import org.chromium.chrome.browser.widget.ThumbnailCacheEntry.ContentId;
 import org.chromium.chrome.browser.widget.ThumbnailCacheEntry.ThumbnailEntry;
 
@@ -49,7 +50,8 @@ import java.util.LinkedHashSet;
  */
 public class ThumbnailDiskStorage implements ThumbnailGeneratorCallback {
     private static final String TAG = "ThumbnailStorage";
-    private static final int MAX_CACHE_BYTES = 1024 * 1024; // Max disk cache size is 1MB.
+    private static final int MAX_CACHE_BYTES =
+            ConversionUtils.BYTES_PER_MEGABYTE; // Max disk cache size is 1MB.
 
     // LRU cache of a pair of thumbnail's contentID and size. The order is based on the sequence of
     // add and get with the most recent at the end. The order at initialization (i.e. browser

chrome/android/java/src/org/chromium/chrome/browser/widget/ThumbnailProviderImpl.java

@@ -12,6 +12,7 @@ import android.text.TextUtils;
 import org.chromium.base.DiscardableReferencePool;
 import org.chromium.base.ThreadUtils;
 import org.chromium.chrome.browser.BitmapCache;
+import org.chromium.chrome.browser.util.ConversionUtils;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
@@ -28,7 +29,7 @@ import java.util.Locale;
  */
 public class ThumbnailProviderImpl implements ThumbnailProvider, ThumbnailStorageDelegate {
     /** 5 MB of thumbnails should be enough for everyone. */
-    private static final int MAX_CACHE_BYTES = 5 * 1024 * 1024;
+    private static final int MAX_CACHE_BYTES = 5 * ConversionUtils.BYTES_PER_MEGABYTE;
 
     private BitmapCache mBitmapCache;