implementation for new duplicate download UI

chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadTest.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.download;
 
 import android.os.Environment;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.view.View;
 
@@ skipping 125 matching lines @@
                     @Override
                     public Integer call() {
                         return getActivity().getCurrentTabModel().getCount();
                     }
                 }));
     }
 
     @MediumTest
     @Feature({"Downloads"})
     @RetryOnFailure
-    public void testDuplicateHttpPostDownload_Overwrite() throws Exception {
+    public void testDuplicateHttpPostDownload_Download() throws Exception {
         // Snackbar overlaps the infobar which is clicked in this test.
         getActivity().getSnackbarManager().disableForTesting();
         // Download a file.
         loadUrl(mTestServer.getURL(TEST_DOWNLOAD_DIRECTORY + "post.html"));
         waitForFocus();
         View currentView = getActivity().getActivityTab().getView();
         int callCount = getChromeDownloadCallCount();
         singleClickView(currentView);
         assertTrue("Failed to finish downloading file for the first time.",
                 waitForChromeDownloadToFinish(callCount));
 
         // Download a file with the same name.
         loadUrl(mTestServer.getURL(TEST_DOWNLOAD_DIRECTORY + "post.html"));
         waitForFocus();
         currentView = getActivity().getActivityTab().getView();
         callCount = getChromeDownloadCallCount();
         singleClickView(currentView);
         assertPollForInfoBarSize(1);
-        assertTrue("OVERWRITE button wasn't found",
+        assertTrue("Download button wasn't found",
                 InfoBarUtil.clickPrimaryButton(getInfoBars().get(0)));
         assertTrue("Failed to finish downloading file for the second time.",
                 waitForChromeDownloadToFinish(callCount));
 
         assertTrue("Missing first download", hasDownload(FILENAME_TEXT, SUPERBO_CONTENTS));
-        assertFalse("Should not have second download",
-                hasDownload(FILENAME_TEXT_1, SUPERBO_CONTENTS));
+        assertTrue("Missing second download", hasDownload(FILENAME_TEXT_1, SUPERBO_CONTENTS));
     }
 
     @MediumTest
     @Feature({"Downloads"})
     @DisabledTest(message = "crbug.com/597230")
-    public void testDuplicateHttpPostDownload_CreateNew() throws Exception {
+    public void testDuplicateHttpPostDownload_Cancel() throws Exception {
         // Download a file.
         loadUrl(mTestServer.getURL(TEST_DOWNLOAD_DIRECTORY + "post.html"));
         waitForFocus();
         View currentView = getActivity().getActivityTab().getView();
         int callCount = getChromeDownloadCallCount();
         singleClickView(currentView);
         assertTrue("Failed to finish downloading file for the first time.",
                 waitForChromeDownloadToFinish(callCount));
 
         // Download a file with the same name.
         loadUrl(mTestServer.getURL(TEST_DOWNLOAD_DIRECTORY + "post.html"));
         waitForFocus();
         currentView = getActivity().getActivityTab().getView();
         callCount = getChromeDownloadCallCount();
         singleClickView(currentView);
         assertPollForInfoBarSize(1);
         assertTrue("CREATE NEW button wasn't found",
                 InfoBarUtil.clickSecondaryButton(getInfoBars().get(0)));
-        assertTrue("Failed to finish downloading file for the second time.",
+        assertFalse("Download should not happen when clicking cancel button",
                 waitForChromeDownloadToFinish(callCount));
-
-        assertTrue("Missing first download", hasDownload(FILENAME_TEXT, SUPERBO_CONTENTS));
-        assertTrue("Missing second download",
-                hasDownload(FILENAME_TEXT_1, SUPERBO_CONTENTS));
     }
 
     @MediumTest
     @Feature({"Downloads"})
     @FlakyTest(message = "crbug.com/415711")
     public void testDuplicateHttpPostDownload_Dismiss() throws Exception {
         // Download a file.
         loadUrl(mTestServer.getURL(TEST_DOWNLOAD_DIRECTORY + "post.html"));
         waitForFocus();
         View currentView = getActivity().getActivityTab().getView();
@@ skipping 193 matching lines @@
     }
 
     /**
      * Makes sure there are no files with names identical to the ones this test uses in the
      * downloads directory
      */
     private void deleteTestFiles() {
         deleteFilesInDownloadDirectory(TEST_FILES);
     }
 }