Change FlakyTest from android.test.FlakyTest to our version

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.FlakyTest;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.view.View;
 
 import org.chromium.base.Log;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
+import org.chromium.base.test.util.FlakyTest;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.compositor.CompositorViewHolder;
 import org.chromium.chrome.browser.compositor.layouts.LayoutManager;
 import org.chromium.chrome.browser.compositor.layouts.StaticLayout;
 import org.chromium.chrome.browser.infobar.InfoBarContainer;
 import org.chromium.chrome.browser.tabmodel.TabModel;
 import org.chromium.chrome.browser.tabmodel.TabModelUtils;
 import org.chromium.chrome.test.util.InfoBarUtil;
 import org.chromium.content.browser.test.util.Criteria;
@@ skipping 170 matching lines @@
         assertTrue("Missing first download", hasDownload("superbo.txt", SUPERBO_CONTENTS));
         assertTrue("Missing second download",
                 hasDownload("superbo (1).txt", SUPERBO_CONTENTS));
     }
 
     /*
     Bug http://crbug/415711
     */
     @MediumTest
     @Feature({"Downloads"})
     @FlakyTest

[mikecase (-- gone --), 2016/04/19 19:07:08]

Change @FlakyTest to...

@FlakyTest(message = "crbug/415711")

     public void testDuplicateHttpPostDownload_Dismiss() throws Exception {
         // Download a file.
         loadUrl(mTestServer.getURL("/chrome/test/data/android/download/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));
 
@@ skipping 185 matching lines @@
         CriteriaHelper.pollUiThread(new Criteria() {
             @Override
             public boolean isSatisfied() {
                 updateFailureReason("There should be " + size + " infobar but there are "
                         + getInfoBars().size() + " infobars.");
                 return getInfoBars().size() == size && !container.isAnimating();
             }
         });
     }
 }