| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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.prerender; | 5 package org.chromium.chrome.browser.prerender; |
| 6 | 6 |
| 7 import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_NON_LOW_E
ND_DEVICE; | 7 import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_NON_LOW_E
ND_DEVICE; |
| 8 | 8 |
| 9 import android.graphics.Rect; | 9 import android.graphics.Rect; |
| 10 import android.support.test.filters.SmallTest; | 10 import android.support.test.filters.SmallTest; |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 }); | 107 }); |
| 108 ensureCompletedPrerenderForUrl(webContents, mTestPage); | 108 ensureCompletedPrerenderForUrl(webContents, mTestPage); |
| 109 ensureCompletedPrerenderForUrl(webContents2, mTestPage2); | 109 ensureCompletedPrerenderForUrl(webContents2, mTestPage2); |
| 110 } | 110 } |
| 111 | 111 |
| 112 private WebContents ensureStartedPrerenderForUrl(final String url) throws Ex
ception { | 112 private WebContents ensureStartedPrerenderForUrl(final String url) throws Ex
ception { |
| 113 Callable<WebContents> addPrerenderCallable = new Callable<WebContents>()
{ | 113 Callable<WebContents> addPrerenderCallable = new Callable<WebContents>()
{ |
| 114 @Override | 114 @Override |
| 115 public WebContents call() { | 115 public WebContents call() { |
| 116 Pair<WebContents, WebContents> webContents = | 116 Pair<WebContents, WebContents> webContents = |
| 117 mExternalPrerenderHandler.addPrerender( | 117 mExternalPrerenderHandler.addPrerender(mProfile, url, ""
, new Rect(), true); |
| 118 mProfile, url, "", new Rect(), false); | |
| 119 assertNotNull(webContents); | 118 assertNotNull(webContents); |
| 120 assertNotNull(webContents.first); | 119 assertNotNull(webContents.first); |
| 121 assertNotNull(webContents.second); | 120 assertNotNull(webContents.second); |
| 122 assertTrue(ExternalPrerenderHandler.hasPrerenderedUrl( | 121 assertTrue(ExternalPrerenderHandler.hasPrerenderedUrl( |
| 123 mProfile, url, webContents.first)); | 122 mProfile, url, webContents.first)); |
| 124 return webContents.first; | 123 return webContents.first; |
| 125 } | 124 } |
| 126 }; | 125 }; |
| 127 return ThreadUtils.runOnUiThreadBlocking(addPrerenderCallable); | 126 return ThreadUtils.runOnUiThreadBlocking(addPrerenderCallable); |
| 128 } | 127 } |
| 129 | 128 |
| 130 private void ensureCompletedPrerenderForUrl(final WebContents webContents, f
inal String url) { | 129 private void ensureCompletedPrerenderForUrl(final WebContents webContents, f
inal String url) { |
| 131 CriteriaHelper.pollUiThread(new Criteria("No Prerender") { | 130 CriteriaHelper.pollUiThread(new Criteria("No Prerender") { |
| 132 @Override | 131 @Override |
| 133 public boolean isSatisfied() { | 132 public boolean isSatisfied() { |
| 134 return ExternalPrerenderHandler.hasPrerenderedAndFinishedLoading
Url( | 133 return ExternalPrerenderHandler.hasPrerenderedAndFinishedLoading
Url( |
| 135 mProfile, url, webContents); | 134 mProfile, url, webContents); |
| 136 } | 135 } |
| 137 }); | 136 }); |
| 138 } | 137 } |
| 139 } | 138 } |
| OLD | NEW |