ServiceWorker: mojofy ResumeAfterDownload and AddMessageToConsole

content/browser/service_worker/embedded_worker_instance_unittest.cc

Index: content/browser/service_worker/embedded_worker_instance_unittest.cc
diff --git a/content/browser/service_worker/embedded_worker_instance_unittest.cc b/content/browser/service_worker/embedded_worker_instance_unittest.cc
index 240bd4f7360d17ba1cd423edd911a2f949a977b7..1cdcf4a54a68ac1c9396935b2bd517669e7b2875 100644
--- a/content/browser/service_worker/embedded_worker_instance_unittest.cc
+++ b/content/browser/service_worker/embedded_worker_instance_unittest.cc
@@ -521,11 +521,26 @@ TEST_F(EmbeddedWorkerInstanceTest, StopDuringProcessAllocation) {
   worker->Stop();
 }
 
+class DontReceiveResumeAfterDownloadInstanceClient
+    : public EmbeddedWorkerTestHelper::MockEmbeddedWorkerInstanceClient {
+ public:
+  explicit DontReceiveResumeAfterDownloadInstanceClient(
+      base::WeakPtr<EmbeddedWorkerTestHelper> helper)
+      : EmbeddedWorkerTestHelper::MockEmbeddedWorkerInstanceClient(helper) {}
+
+ private:
+  void ResumeAfterDownload() override { NOTREACHED(); }

[falken, 2017/01/18 01:12:06]

Can you avoid the NOTREACHED by keeping state and checking it in the test as an
EXPECT()?

From style guide:
https://chromium.googlesource.com/chromium/src/+/master/styleguide/c++/c++.md
"Don't use these macros in tests, as they crash the test binary and leave bots
in a bad state. Use the ASSERT_xx() and EXPECT_xx() family of macros, which
report failures gracefully and can continue running other tests."

[shimazu, 2017/01/18 03:47:45]

Thanks, done.

+};
+
 TEST_F(EmbeddedWorkerInstanceTest, StopDuringPausedAfterDownload) {
   const int64_t version_id = 55L;
   const GURL scope("http://example.com/");
   const GURL url("http://example.com/worker.js");
 
+  helper_->RegisterMockInstanceClient(
+      base::MakeUnique<DontReceiveResumeAfterDownloadInstanceClient>(
+          helper_->AsWeakPtr()));
+
   std::unique_ptr<EmbeddedWorkerInstance> worker =
       embedded_worker_registry()->CreateWorker();
   worker->AddListener(this);
@@ -549,8 +564,6 @@ TEST_F(EmbeddedWorkerInstanceTest, StopDuringPausedAfterDownload) {
 
   // The resume after download message should not have been sent.
   EXPECT_EQ(EmbeddedWorkerStatus::STOPPED, worker->status());
-  EXPECT_FALSE(ipc_sink()->GetFirstMessageMatching(
-      EmbeddedWorkerMsg_ResumeAfterDownload::ID));
 }
 
 TEST_F(EmbeddedWorkerInstanceTest, StopAfterSendingStartWorkerMessage) {