diff options
| author | michaeln <michaeln@chromium.org> | 2015-08-10 18:37:31 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-11 01:38:09 +0000 |
| commit | 68bf4a8e51faf53a33c8d49158e090e90e7177f5 (patch) | |
| tree | 79cb179a6d71b167e85e0d3c7bd8f66639978b76 /chrome/test/base/in_process_browser_test_browsertest.cc | |
| parent | 698215b835be4e12f1c60e58b440b34d84cbdd9c (diff) | |
| download | chromium_src-68bf4a8e51faf53a33c8d49158e090e90e7177f5.zip chromium_src-68bf4a8e51faf53a33c8d49158e090e90e7177f5.tar.gz chromium_src-68bf4a8e51faf53a33c8d49158e090e90e7177f5.tar.bz2 | |
Defer ServiceWorker update checks until after browser startup is complete.
Also implement after startup task deferral more reasonably on android. Now its based on a signal from DeferredStartupHandler.java instead of an arbitrary 10 second timer.
BUG=460265
Review URL: https://codereview.chromium.org/1078283002
Cr-Commit-Position: refs/heads/master@{#342768}
Diffstat (limited to 'chrome/test/base/in_process_browser_test_browsertest.cc')
| -rw-r--r-- | chrome/test/base/in_process_browser_test_browsertest.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/test/base/in_process_browser_test_browsertest.cc b/chrome/test/base/in_process_browser_test_browsertest.cc index 4c0d004..a438b07 100644 --- a/chrome/test/base/in_process_browser_test_browsertest.cc +++ b/chrome/test/base/in_process_browser_test_browsertest.cc @@ -6,6 +6,7 @@ #include "base/files/file_util.h" #include "base/path_service.h" +#include "chrome/browser/after_startup_task_utils.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/test/base/in_process_browser_test.h" @@ -84,6 +85,12 @@ IN_PROC_BROWSER_TEST_F(InProcessBrowserTest, ExternalConnectionFail) { } } +// Verify that AfterStartupTaskUtils considers startup to be complete +// prior to test execution so tasks posted by tests are never deferred. +IN_PROC_BROWSER_TEST_F(InProcessBrowserTest, AfterStartupTaskUtils) { + EXPECT_TRUE(AfterStartupTaskUtils::IsBrowserStartupComplete()); +} + // Paths are to very simple HTML files. One is accessible, the other is not. const base::FilePath::CharType kPassHTML[] = FILE_PATH_LITERAL("chrome/test/data/accessibility_pass.html"); |