Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(127)

Unified Diff: content/browser/service_worker/service_worker_browsertest.cc

Issue 2491613004: Make base::Timer sequence-friendly. (Closed)
Patch Set: add back commented out DCHECK in Stop() Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/service_worker/service_worker_browsertest.cc
diff --git a/content/browser/service_worker/service_worker_browsertest.cc b/content/browser/service_worker/service_worker_browsertest.cc
index 3f96ad842386c5c7acf27cc5b5d3c694de31f0aa..80c02c855744a6ba5af99fcd338a3bc166b31292 100644
--- a/content/browser/service_worker/service_worker_browsertest.cc
+++ b/content/browser/service_worker/service_worker_browsertest.cc
@@ -663,6 +663,7 @@ class ServiceWorkerVersionBrowserTest : public ServiceWorkerBrowserTest {
void TimeoutWorkerOnIOThread() {
ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ EXPECT_TRUE(version_->timeout_timer_.IsRunning());
version_->SimulatePingTimeoutForTesting();
}
@@ -1174,7 +1175,6 @@ IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, TimeoutStartingWorker) {
// Simulate execution timeout. Use a delay to prevent killing the worker
// before it's started execution.
- EXPECT_TRUE(version_->timeout_timer_.IsRunning());
RunOnIOThreadWithDelay(
base::Bind(&self::TimeoutWorkerOnIOThread, base::Unretained(this)),
base::TimeDelta::FromMilliseconds(100));
@@ -1208,7 +1208,6 @@ IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, TimeoutWorkerInEvent) {
// Simulate execution timeout. Use a delay to prevent killing the worker
// before it's started execution.
- EXPECT_TRUE(version_->timeout_timer_.IsRunning());
RunOnIOThreadWithDelay(
base::Bind(&self::TimeoutWorkerOnIOThread, base::Unretained(this)),
base::TimeDelta::FromMilliseconds(100));

Powered by Google App Engine
This is Rietveld 408576698