| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 package org.chromium.chrome.browser; | 5 package org.chromium.chrome.browser; |
| 6 | 6 |
| 7 import android.annotation.TargetApi; | 7 import android.annotation.TargetApi; |
| 8 import android.app.Activity; | 8 import android.app.Activity; |
| 9 import android.content.Intent; | 9 import android.content.Intent; |
| 10 import android.os.Build; | 10 import android.os.Build; |
| 11 import android.provider.MediaStore; | 11 import android.provider.MediaStore; |
| 12 import android.test.suitebuilder.annotation.MediumTest; | 12 import android.support.test.filters.MediumTest; |
| 13 | 13 |
| 14 import org.chromium.base.ThreadUtils; | 14 import org.chromium.base.ThreadUtils; |
| 15 import org.chromium.base.test.util.Feature; | 15 import org.chromium.base.test.util.Feature; |
| 16 import org.chromium.base.test.util.RetryOnFailure; | 16 import org.chromium.base.test.util.RetryOnFailure; |
| 17 import org.chromium.base.test.util.UrlUtils; | 17 import org.chromium.base.test.util.UrlUtils; |
| 18 import org.chromium.chrome.test.ChromeActivityTestCaseBase; | 18 import org.chromium.chrome.test.ChromeActivityTestCaseBase; |
| 19 import org.chromium.content.browser.ContentViewCore; | 19 import org.chromium.content.browser.ContentViewCore; |
| 20 import org.chromium.content.browser.test.util.Criteria; | 20 import org.chromium.content.browser.test.util.Criteria; |
| 21 import org.chromium.content.browser.test.util.CriteriaHelper; | 21 import org.chromium.content.browser.test.util.CriteriaHelper; |
| 22 import org.chromium.content.browser.test.util.DOMUtils; | 22 import org.chromium.content.browser.test.util.DOMUtils; |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 @Override | 139 @Override |
| 140 public void run() { | 140 public void run() { |
| 141 mActivityWindowAndroidForTest.lastCallback.onIntentCompleted( | 141 mActivityWindowAndroidForTest.lastCallback.onIntentCompleted( |
| 142 mActivityWindowAndroidForTest, Activity.RESULT_CANCELED,
null); | 142 mActivityWindowAndroidForTest, Activity.RESULT_CANCELED,
null); |
| 143 } | 143 } |
| 144 }); | 144 }); |
| 145 mActivityWindowAndroidForTest.lastCallback = null; | 145 mActivityWindowAndroidForTest.lastCallback = null; |
| 146 mActivityWindowAndroidForTest.lastIntent = null; | 146 mActivityWindowAndroidForTest.lastIntent = null; |
| 147 } | 147 } |
| 148 } | 148 } |
| OLD | NEW |