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

content/browser/service_worker/embedded_worker_instance_unittest.cc

 // Copyright 2013 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 "base/basictypes.h"
 #include "base/run_loop.h"
 #include "base/stl_util.h"
 #include "content/browser/service_worker/embedded_worker_instance.h"
 #include "content/browser/service_worker/embedded_worker_registry.h"
 #include "content/browser/service_worker/embedded_worker_test_helper.h"
@@ skipping 56 matching lines @@
 
   // Start should succeed.
   ServiceWorkerStatusCode status;
   base::RunLoop run_loop;
   worker->Start(
       service_worker_version_id,
       pattern,
       url,
       false,
       base::Bind(&SaveStatusAndCall, &status, run_loop.QuitClosure()));
+  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);
-  EXPECT_EQ(EmbeddedWorkerInstance::STARTING, worker->status());
-  base::RunLoop().RunUntilIdle();
 
   // Worker started message should be notified (by EmbeddedWorkerTestHelper).
   EXPECT_EQ(EmbeddedWorkerInstance::RUNNING, worker->status());
   EXPECT_EQ(kRenderProcessId, worker->process_id());
 
   // Stop the worker.
   EXPECT_EQ(SERVICE_WORKER_OK, worker->Stop());
   EXPECT_EQ(EmbeddedWorkerInstance::STOPPING, worker->status());
   base::RunLoop().RunUntilIdle();
 
@@ skipping 31 matching lines @@
   worker.reset();
   run_loop.Run();
   EXPECT_EQ(SERVICE_WORKER_ERROR_ABORT, status);
 
   // Verify that we didn't send the message to start the worker.
   ASSERT_FALSE(
       ipc_sink()->GetUniqueMessageMatching(EmbeddedWorkerMsg_StartWorker::ID));
 }
 
 }  // namespace content