ServiceWorker: Registering a malformed script should fail [2/3]

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 5c1b853d56b806988f41646ea158ab16fbb0dc5e..3f4df24f730ba54691c9c8aa188d64b86bbf3d45 100644
--- a/content/browser/service_worker/embedded_worker_instance_unittest.cc
+++ b/content/browser/service_worker/embedded_worker_instance_unittest.cc
@@ -74,11 +74,13 @@ TEST_F(EmbeddedWorkerInstanceTest, StartAndStop) {
       url,
       false,
       base::Bind(&SaveStatusAndCall, &status, run_loop.QuitClosure()));
-  run_loop.Run();
-  EXPECT_EQ(SERVICE_WORKER_OK, status);
   EXPECT_EQ(EmbeddedWorkerInstance::STARTING, worker->status());
+  run_loop.Run();
   base::RunLoop().RunUntilIdle();

[falken, 2014/11/06 03:15:31]

I'm not sure I understand base::RunLoop. Do you need both Run() and
RunUntilIdle()?

[nhiroki, 2014/11/06 04:12:46]

Yes, this is not necessary. Removed.

(I thought the same thing but left it as it was because I wanted to avoid
unrelated fix.)

 
+  // Script evaluated message should be notified (by EmbeddedWorkerTestHelper).

[falken, 2014/11/06 03:15:31]

I don't understand this comment, both the wording and its relation to the code.
I think it means "The 'script evaluated' message should have been received"...
but it's not clear what that has to do with the next line of code.

[nhiroki, 2014/11/06 04:12:46]

Fixed.
|status| is set in the callback |SaveStatusAndCall| and the callback is executed
when the 'script evaluated' message arrived. This comment meant to say that the
expectation makes sure the message has been received.

Actually, the message reachability is confirmed by |run_loop.Run()|, so this
comment seems confusing. Removed.

+  EXPECT_EQ(SERVICE_WORKER_OK, status);
+
   // Worker started message should be notified (by EmbeddedWorkerTestHelper).
   EXPECT_EQ(EmbeddedWorkerInstance::RUNNING, worker->status());
   EXPECT_EQ(kRenderProcessId, worker->process_id());