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.content.browser; | 5 package org.chromium.content.browser; |
6 | 6 |
7 import android.test.suitebuilder.annotation.SmallTest; | 7 import android.test.suitebuilder.annotation.SmallTest; |
8 import android.text.TextUtils; | 8 import android.text.TextUtils; |
9 import android.util.Pair; | 9 import android.util.Pair; |
10 | 10 |
11 import org.chromium.base.test.util.UrlUtils; | 11 import org.chromium.base.test.util.UrlUtils; |
12 import org.chromium.content.browser.test.util.TestCallbackHelperContainer; | 12 import org.chromium.content.browser.test.util.TestCallbackHelperContainer; |
| 13 import org.chromium.content_public.browser.LoadUrlParams; |
13 import org.chromium.content_public.browser.NavigationTransitionDelegate; | 14 import org.chromium.content_public.browser.NavigationTransitionDelegate; |
14 import org.chromium.content_shell_apk.ContentShellActivity; | 15 import org.chromium.content_shell_apk.ContentShellActivity; |
15 import org.chromium.content_shell_apk.ContentShellTestBase; | 16 import org.chromium.content_shell_apk.ContentShellTestBase; |
16 import org.chromium.net.test.util.TestWebServer; | 17 import org.chromium.net.test.util.TestWebServer; |
17 | 18 |
18 import java.util.ArrayList; | 19 import java.util.ArrayList; |
19 import java.util.List; | 20 import java.util.List; |
20 import java.util.concurrent.TimeUnit; | 21 import java.util.concurrent.TimeUnit; |
21 | 22 |
22 /** | 23 /** |
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
303 | 304 |
304 assertTrue("X-Transition-Entering-Color parsed correctly.", | 305 assertTrue("X-Transition-Entering-Color parsed correctly.", |
305 TextUtils.equals( | 306 TextUtils.equals( |
306 delegate.getTransitionEnteringColor(), | 307 delegate.getTransitionEnteringColor(), |
307 transitionEnteringColor)); | 308 transitionEnteringColor)); |
308 } finally { | 309 } finally { |
309 if (webServer != null) webServer.shutdown(); | 310 if (webServer != null) webServer.shutdown(); |
310 } | 311 } |
311 } | 312 } |
312 } | 313 } |
OLD | NEW |