Make base::Timer sequence-friendly.

content/browser/service_worker/service_worker_browsertest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <utility>
@@ skipping 645 matching lines @@
 
     // Make the registration findable via storage functions.
     wrapper()->context()->storage()->NotifyInstallingRegistration(
         registration_.get());
 
     AssociateRendererProcessToPattern(pattern);
   }
 
   void TimeoutWorkerOnIOThread() {
     ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO));
     version_->SimulatePingTimeoutForTesting();

[horo, 2017/04/27 15:49:52]

Add EXPECT_TRUE(version_->timeout_timer_.IsRunning());

[gab, 2017/05/26 04:26:57]

Done.

   }
 
   void AddControlleeOnIOThread() {
     ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO));
     std::unique_ptr<ServiceWorkerProviderHost> host =
         CreateProviderHostForWindow(33 /* dummy render process id */,
                                     1 /* dummy provider_id */,
                                     true /* is_parent_frame_secure */,
                                     wrapper()->context()->AsWeakPtr());
     host->SetDocumentUrl(
@@ skipping 487 matching lines @@
   RunOnIOThread(base::Bind(&EmbeddedWorkerInstance::RemoveListener,
                            base::Unretained(version_->embedded_worker()),
                            &wait_for_load));
 
   // The script has loaded but start has not completed yet.
   ASSERT_EQ(SERVICE_WORKER_ERROR_FAILED, status);
   EXPECT_EQ(EmbeddedWorkerStatus::STARTING, version_->running_status());
 
   // Simulate execution timeout. Use a delay to prevent killing the worker
   // before it's started execution.
-  EXPECT_TRUE(version_->timeout_timer_.IsRunning());
   RunOnIOThreadWithDelay(

[horo, 2017/04/27 02:33:12]

Keep this as is, and call "version_->timeout_timer_.IsRunning()" in
TimeoutWorkerOnIOThread()

[gab, 2017/04/27 14:56:04]

RunOnIOThreadWithDelay is an anonymous method, it doesn't have access to
|version_|.

[horo, 2017/04/27 15:49:52]

TimeoutWorkerOnIOThread() have access to |version_|.

[gab, 2017/05/26 04:26:57]

Done.

-      base::Bind(&self::TimeoutWorkerOnIOThread, base::Unretained(this)),
+      base::Bind(
+          [](const base::Timer* timeout_timer, self* self) {
+            EXPECT_TRUE(timeout_timer->IsRunning());
+            self->TimeoutWorkerOnIOThread();
+          },
+          base::Unretained(&version_->timeout_timer_), base::Unretained(this)),
       base::TimeDelta::FromMilliseconds(100));
   start_run_loop.Run();
 
   EXPECT_EQ(SERVICE_WORKER_ERROR_TIMEOUT, status);
 }
 
 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, TimeoutWorkerInEvent) {
   StartServerAndNavigateToSetup();
   RunOnIOThread(base::Bind(&self::SetUpRegistrationOnIOThread,
                            base::Unretained(this),
@@ skipping 11 matching lines @@
 
   // Dispatch an event.
   base::RunLoop install_run_loop;
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&self::InstallOnIOThread, base::Unretained(this),
                  install_run_loop.QuitClosure(), &status));
 
   // 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::Bind(
+          [](const base::Timer* timeout_timer, self* self) {
+            EXPECT_TRUE(timeout_timer->IsRunning());
+            self->TimeoutWorkerOnIOThread();
+          },
+          base::Unretained(&version_->timeout_timer_), base::Unretained(this)),
       base::TimeDelta::FromMilliseconds(100));
   install_run_loop.Run();
 
   // Terminating a worker, even one in an infinite loop, is treated as if
   // waitUntil was rejected in the renderer code.
   EXPECT_EQ(SERVICE_WORKER_ERROR_EVENT_WAITUNTIL_REJECTED, status);
 }
 
 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, FetchEvent_Response) {
   StartServerAndNavigateToSetup();
@@ skipping 1787 matching lines @@
   // effect in CanSuspendRenderer().
   shell()->web_contents()->WasHidden();
   EXPECT_TRUE(rph->IsProcessBackgrounded());
 
   // The process which has service worker thread shouldn't be suspended.
   EXPECT_FALSE(memory_coordinator->CanSuspendRenderer(render_process_id));
 }
 #endif
 
 }  // namespace content