Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / content / browser / service_worker / service_worker_url_request_job_unittest.cc

diff --git a/src/content/browser/service_worker/service_worker_url_request_job_unittest.cc b/src/content/browser/service_worker/service_worker_url_request_job_unittest.cc
index 54a2cc9..df9d126 100644 (file)
--- a/src/content/browser/service_worker/service_worker_url_request_job_unittest.cc
+++ b/src/content/browser/service_worker/service_worker_url_request_job_unittest.cc
@@ -95,7 +95,7 @@ class ServiceWorkerURLRequestJobTest : public testing::Test {
     helper_.reset(helper);
 
     registration_ = new ServiceWorkerRegistration(
-        GURL("http://example.com/*"),
+        GURL("http://example.com/"),
         GURL("http://example.com/service_worker.js"),
         1L,
         helper_->context()->AsWeakPtr());
@@ -105,7 +105,8 @@ class ServiceWorkerURLRequestJobTest : public testing::Test {
     scoped_ptr<ServiceWorkerProviderHost> provider_host(
         new ServiceWorkerProviderHost(
             kProcessID, kProviderID, helper_->context()->AsWeakPtr(), NULL));
-    provider_host->SetActiveVersion(version_.get());
+    provider_host->AssociateRegistration(registration_);
+    registration_->SetActiveVersion(version_.get());
 
     ChromeBlobStorageContext* chrome_blob_storage_context =
         ChromeBlobStorageContext::GetFor(browser_context_.get());
@@ -166,22 +167,13 @@ class ServiceWorkerURLRequestJobTest : public testing::Test {
 
   scoped_refptr<webkit_blob::BlobData> blob_data_;
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerURLRequestJobTest);
 };
 
 TEST_F(ServiceWorkerURLRequestJobTest, Simple) {
-  version_->SetStatus(ServiceWorkerVersion::ACTIVE);
-  TestRequest(200, "OK", std::string());
-}
-
-TEST_F(ServiceWorkerURLRequestJobTest, WaitForActivation) {
-  ServiceWorkerStatusCode status = SERVICE_WORKER_ERROR_FAILED;
-  version_->SetStatus(ServiceWorkerVersion::INSTALLED);
-  version_->DispatchActivateEvent(CreateReceiverOnCurrentThread(&status));
-
+  version_->SetStatus(ServiceWorkerVersion::ACTIVATED);
   TestRequest(200, "OK", std::string());
-
-  EXPECT_EQ(SERVICE_WORKER_OK, status);
 }
 
 // Responds to fetch events with a blob.
@@ -200,13 +192,16 @@ class BlobResponder : public EmbeddedWorkerTestHelper {
         embedded_worker_id,
         request_id,
         SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE,
-        ServiceWorkerResponse(200,
+        ServiceWorkerResponse(GURL(""),
+                              200,
                               "OK",
                               std::map<std::string, std::string>(),
                               blob_uuid_)));
   }
 
   std::string blob_uuid_;
+
+ private:
   DISALLOW_COPY_AND_ASSIGN(BlobResponder);
 };
 
@@ -222,13 +217,13 @@ TEST_F(ServiceWorkerURLRequestJobTest, BlobResponse) {
       blob_storage_context->context()->AddFinishedBlob(blob_data_);
   SetUpWithHelper(new BlobResponder(kProcessID, blob_handle->uuid()));
 
-  version_->SetStatus(ServiceWorkerVersion::ACTIVE);
+  version_->SetStatus(ServiceWorkerVersion::ACTIVATED);
   TestRequest(200, "OK", expected_response);
 }
 
 TEST_F(ServiceWorkerURLRequestJobTest, NonExistentBlobUUIDResponse) {
   SetUpWithHelper(new BlobResponder(kProcessID, "blob-id:nothing-is-here"));
-  version_->SetStatus(ServiceWorkerVersion::ACTIVE);
+  version_->SetStatus(ServiceWorkerVersion::ACTIVATED);
   TestRequest(500, "Service Worker Response Error", std::string());
 }