| Index: chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadUtilsTest.java
 | 
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadUtilsTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadUtilsTest.java
 | 
| index f9f0d06ac4e324426113bbedb57bb6133eb867d2..22dc9727052625db930f0bdbc23af431cf10bd56 100644
 | 
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadUtilsTest.java
 | 
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadUtilsTest.java
 | 
| @@ -4,6 +4,8 @@
 | 
|  
 | 
|  package org.chromium.chrome.browser.download;
 | 
|  
 | 
| +import android.content.Context;
 | 
| +import android.support.test.InstrumentationRegistry;
 | 
|  import android.support.test.filters.SmallTest;
 | 
|  
 | 
|  import org.junit.Assert;
 | 
| @@ -12,12 +14,16 @@ import org.junit.runner.RunWith;
 | 
|  
 | 
|  import org.chromium.base.test.util.Feature;
 | 
|  import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 | 
| +import org.chromium.components.offline_items_collection.OfflineItem.Progress;
 | 
| +import org.chromium.components.offline_items_collection.OfflineItemProgressUnit;
 | 
|  
 | 
|  /**
 | 
|   * Tests of {@link DownloadUtils}.
 | 
|   */
 | 
|  @RunWith(ChromeJUnit4ClassRunner.class)
 | 
|  public class DownloadUtilsTest {
 | 
| +    private static final int MILLIS_PER_SECOND = 1000;
 | 
| +
 | 
|      /**
 | 
|       * Test {@link DownloadUtils#getAbbrieviatedFileName()} method.
 | 
|       */
 | 
| @@ -33,4 +39,77 @@ public class DownloadUtilsTest {
 | 
|          Assert.assertEquals("123" + DownloadUtils.ELLIPSIS + ".pdf",
 | 
|                  DownloadUtils.getAbbreviatedFileName("1234567.pdf", 7));
 | 
|      }
 | 
| +
 | 
| +    @Test
 | 
| +    @SmallTest
 | 
| +    @Feature({"Download"})
 | 
| +    public void testFormatRemainingTime() {
 | 
| +        final Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
 | 
| +        Assert.assertEquals("0 secs left", DownloadUtils.formatRemainingTime(context, 0));
 | 
| +        Assert.assertEquals(
 | 
| +                "1 sec left", DownloadUtils.formatRemainingTime(context, MILLIS_PER_SECOND));
 | 
| +        Assert.assertEquals("1 min left",
 | 
| +                DownloadUtils.formatRemainingTime(
 | 
| +                        context, DownloadUtils.SECONDS_PER_MINUTE * MILLIS_PER_SECOND));
 | 
| +        Assert.assertEquals(
 | 
| +                "2 mins left", DownloadUtils.formatRemainingTime(context, 149 * MILLIS_PER_SECOND));
 | 
| +        Assert.assertEquals(
 | 
| +                "3 mins left", DownloadUtils.formatRemainingTime(context, 150 * MILLIS_PER_SECOND));
 | 
| +        Assert.assertEquals("1 hour left",
 | 
| +                DownloadUtils.formatRemainingTime(
 | 
| +                        context, DownloadUtils.SECONDS_PER_HOUR * MILLIS_PER_SECOND));
 | 
| +        Assert.assertEquals("2 hours left",
 | 
| +                DownloadUtils.formatRemainingTime(
 | 
| +                        context, 149 * DownloadUtils.SECONDS_PER_MINUTE * MILLIS_PER_SECOND));
 | 
| +        Assert.assertEquals("3 hours left",
 | 
| +                DownloadUtils.formatRemainingTime(
 | 
| +                        context, 150 * DownloadUtils.SECONDS_PER_MINUTE * MILLIS_PER_SECOND));
 | 
| +        Assert.assertEquals("1 day left",
 | 
| +                DownloadUtils.formatRemainingTime(
 | 
| +                        context, DownloadUtils.SECONDS_PER_DAY * MILLIS_PER_SECOND));
 | 
| +        Assert.assertEquals("2 days left",
 | 
| +                DownloadUtils.formatRemainingTime(
 | 
| +                        context, 59 * DownloadUtils.SECONDS_PER_HOUR * MILLIS_PER_SECOND));
 | 
| +        Assert.assertEquals("3 days left",
 | 
| +                DownloadUtils.formatRemainingTime(
 | 
| +                        context, 60 * DownloadUtils.SECONDS_PER_HOUR * MILLIS_PER_SECOND));
 | 
| +    }
 | 
| +
 | 
| +    @Test
 | 
| +    @SmallTest
 | 
| +    @Feature({"Download"})
 | 
| +    public void testFormatBytesReceived() {
 | 
| +        final Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
 | 
| +        Assert.assertEquals("Downloaded 0.0 KB",
 | 
| +                DownloadUtils.getStringForBytes(
 | 
| +                        context, DownloadUtils.BYTES_DOWNLOADED_STRINGS, 0));
 | 
| +        Assert.assertEquals("Downloaded 0.5 KB",
 | 
| +                DownloadUtils.getStringForBytes(
 | 
| +                        context, DownloadUtils.BYTES_DOWNLOADED_STRINGS, 512));
 | 
| +        Assert.assertEquals("Downloaded 1.0 KB",
 | 
| +                DownloadUtils.getStringForBytes(
 | 
| +                        context, DownloadUtils.BYTES_DOWNLOADED_STRINGS, 1024));
 | 
| +        Assert.assertEquals("Downloaded 1.0 MB",
 | 
| +                DownloadUtils.getStringForBytes(
 | 
| +                        context, DownloadUtils.BYTES_DOWNLOADED_STRINGS, 1024 * 1024));
 | 
| +        Assert.assertEquals("Downloaded 1.0 GB",
 | 
| +                DownloadUtils.getStringForBytes(
 | 
| +                        context, DownloadUtils.BYTES_DOWNLOADED_STRINGS, 1024 * 1024 * 1024));
 | 
| +    }
 | 
| +
 | 
| +    @Test
 | 
| +    @SmallTest
 | 
| +    @Feature({"Download"})
 | 
| +    public void testFormatRemainingFiles() {
 | 
| +        final Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
 | 
| +        Progress progress = new Progress(3, Long.valueOf(5), OfflineItemProgressUnit.FILES);
 | 
| +        Assert.assertEquals(60, progress.getPercentage());
 | 
| +        Assert.assertEquals("2 files left", DownloadUtils.formatRemainingFiles(context, progress));
 | 
| +        progress = new Progress(4, Long.valueOf(5), OfflineItemProgressUnit.FILES);
 | 
| +        Assert.assertEquals(80, progress.getPercentage());
 | 
| +        Assert.assertEquals("1 file left", DownloadUtils.formatRemainingFiles(context, progress));
 | 
| +        progress = new Progress(5, Long.valueOf(5), OfflineItemProgressUnit.FILES);
 | 
| +        Assert.assertEquals(100, progress.getPercentage());
 | 
| +        Assert.assertEquals("0 files left", DownloadUtils.formatRemainingFiles(context, progress));
 | 
| +    }
 | 
|  }
 | 
| 
 |