| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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.offlinepages; | 5 package org.chromium.chrome.browser.offlinepages; |
| 6 | 6 |
| 7 import android.content.Context; | |
| 8 import android.support.test.filters.SmallTest; | 7 import android.support.test.filters.SmallTest; |
| 9 | 8 |
| 10 import org.chromium.base.Callback; | 9 import org.chromium.base.Callback; |
| 11 import org.chromium.base.ThreadUtils; | 10 import org.chromium.base.ThreadUtils; |
| 12 import org.chromium.base.test.util.CommandLineFlags; | 11 import org.chromium.base.test.util.CommandLineFlags; |
| 13 import org.chromium.base.test.util.RetryOnFailure; | 12 import org.chromium.base.test.util.RetryOnFailure; |
| 14 import org.chromium.chrome.browser.ChromeActivity; | 13 import org.chromium.chrome.browser.ChromeActivity; |
| 15 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge.OfflinePageMod
elObserver; | 14 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge.OfflinePageMod
elObserver; |
| 16 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge.SavePageCallba
ck; | 15 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge.SavePageCallba
ck; |
| 17 import org.chromium.chrome.browser.profiles.Profile; | 16 import org.chromium.chrome.browser.profiles.Profile; |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 | 76 |
| 78 @Override | 77 @Override |
| 79 protected void setUp() throws Exception { | 78 protected void setUp() throws Exception { |
| 80 super.setUp(); | 79 super.setUp(); |
| 81 | 80 |
| 82 ThreadUtils.runOnUiThreadBlocking(new Runnable() { | 81 ThreadUtils.runOnUiThreadBlocking(new Runnable() { |
| 83 @Override | 82 @Override |
| 84 public void run() { | 83 public void run() { |
| 85 // Ensure we start in an offline state. | 84 // Ensure we start in an offline state. |
| 86 NetworkChangeNotifier.forceConnectivityState(false); | 85 NetworkChangeNotifier.forceConnectivityState(false); |
| 87 Context context = getActivity().getBaseContext(); | |
| 88 if (!NetworkChangeNotifier.isInitialized()) { | 86 if (!NetworkChangeNotifier.isInitialized()) { |
| 89 NetworkChangeNotifier.init(context); | 87 NetworkChangeNotifier.init(); |
| 90 } | 88 } |
| 91 } | 89 } |
| 92 }); | 90 }); |
| 93 | 91 |
| 94 initializeBridgeForProfile(false); | 92 initializeBridgeForProfile(false); |
| 95 | 93 |
| 96 mTestServer = EmbeddedTestServer.createAndStartServer(getInstrumentation
().getContext()); | 94 mTestServer = EmbeddedTestServer.createAndStartServer(getInstrumentation
().getContext()); |
| 97 mTestPage = mTestServer.getURL(TEST_PAGE); | 95 mTestPage = mTestServer.getURL(TEST_PAGE); |
| 98 } | 96 } |
| 99 | 97 |
| (...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 433 ref.set(removedRequests); | 431 ref.set(removedRequests); |
| 434 semaphore.release(); | 432 semaphore.release(); |
| 435 } | 433 } |
| 436 }); | 434 }); |
| 437 } | 435 } |
| 438 }); | 436 }); |
| 439 assertTrue(semaphore.tryAcquire(TIMEOUT_MS, TimeUnit.MILLISECONDS)); | 437 assertTrue(semaphore.tryAcquire(TIMEOUT_MS, TimeUnit.MILLISECONDS)); |
| 440 return ref.get(); | 438 return ref.get(); |
| 441 } | 439 } |
| 442 } | 440 } |
| OLD | NEW |