Revert of Wire InstallFinished and add some InstallEvent.waitUntil tests

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 "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "content/browser/service_worker/embedded_worker_instance.h"
 #include "content/browser/service_worker/embedded_worker_registry.h"
@@ skipping 176 matching lines @@
     if (registration_) {
       registration_->Shutdown();
       registration_ = NULL;
     }
     if (version_) {
       version_->Shutdown();
       version_ = NULL;
     }
   }
 
-  void InstallTestHelper(const std::string& worker_url) {
-    RunOnIOThread(base::Bind(&self::SetUpRegistrationOnIOThread, this,
-                             worker_url));
-
-    // Dispatch install on a worker.
-    ServiceWorkerStatusCode status = SERVICE_WORKER_ERROR_FAILED;
-    base::RunLoop install_run_loop;
-    BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-                            base::Bind(&self::InstallOnIOThread, this,
-                                       install_run_loop.QuitClosure(),
-                                       &status));
-    install_run_loop.Run();
-    ASSERT_EQ(SERVICE_WORKER_OK, status);
-
-    // Stop the worker.
-    status = SERVICE_WORKER_ERROR_FAILED;
-    base::RunLoop stop_run_loop;
-    BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-                            base::Bind(&self::StopOnIOThread, this,
-                                       stop_run_loop.QuitClosure(),
-                                       &status));
-    stop_run_loop.Run();
-    ASSERT_EQ(SERVICE_WORKER_OK, status);
-  }
-
   void SetUpRegistrationOnIOThread(const std::string& worker_url) {
     const int64 version_id = 1L;
     registration_ = new ServiceWorkerRegistration(
         embedded_test_server()->GetURL("/*"),
         embedded_test_server()->GetURL(worker_url),
         next_registration_id_++);
     version_ = new ServiceWorkerVersion(
         registration_,
         wrapper()->context()->embedded_worker_registry(),
         version_id);
@@ skipping 79 matching lines @@
   base::RunLoop start_run_loop;
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                           base::Bind(&self::StartOnIOThread, this,
                                      start_run_loop.QuitClosure(),
                                      &status));
   start_run_loop.Run();
   ASSERT_EQ(SERVICE_WORKER_ERROR_START_WORKER_FAILED, status);
 }
 
 IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest, Install) {
-  InstallTestHelper("/service_worker/worker.js");
-}
+  RunOnIOThread(base::Bind(&self::SetUpRegistrationOnIOThread, this,
+                           "/service_worker/worker.js"));
 
-IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
-                       InstallWithWaitUntil_Fulfilled) {
-  InstallTestHelper("/service_worker/worker_install_fulfilled.js");
-}
+  // Dispatch install on a worker.
+  ServiceWorkerStatusCode status = SERVICE_WORKER_ERROR_FAILED;
+  base::RunLoop install_run_loop;
+  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
+                          base::Bind(&self::InstallOnIOThread, this,
+                                     install_run_loop.QuitClosure(),
+                                     &status));
+  install_run_loop.Run();
+  ASSERT_EQ(SERVICE_WORKER_OK, status);
 
-IN_PROC_BROWSER_TEST_F(ServiceWorkerVersionBrowserTest,
-                       InstallWithWaitUntil_Rejected) {
-  // TODO(kinuko): This should also report back an error, but we
-  // don't have plumbing for it yet.
-  InstallTestHelper("/service_worker/worker_install_rejected.js");
+  // Stop the worker.
+  status = SERVICE_WORKER_ERROR_FAILED;
+  base::RunLoop stop_run_loop;
+  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
+                          base::Bind(&self::StopOnIOThread, this,
+                                     stop_run_loop.QuitClosure(),
+                                     &status));
+  stop_run_loop.Run();
+  ASSERT_EQ(SERVICE_WORKER_OK, status);
 }
 
 }  // namespace content