| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/files/scoped_temp_dir.h" | 5 #include "base/files/scoped_temp_dir.h" |
| 6 #include "base/logging.h" | 6 #include "base/logging.h" |
| 7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
| 8 #include "content/browser/browser_thread_impl.h" | 8 #include "content/browser/browser_thread_impl.h" |
| 9 #include "content/browser/fileapi/mock_url_request_delegate.h" | 9 #include "content/browser/fileapi/mock_url_request_delegate.h" |
| 10 #include "content/browser/service_worker/embedded_worker_test_helper.h" | 10 #include "content/browser/service_worker/embedded_worker_test_helper.h" |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 const GURL kDocUrl("http://host/scope/doc"); | 90 const GURL kDocUrl("http://host/scope/doc"); |
| 91 scoped_ptr<net::URLRequest> request = url_request_context_.CreateRequest( | 91 scoped_ptr<net::URLRequest> request = url_request_context_.CreateRequest( |
| 92 kDocUrl, | 92 kDocUrl, |
| 93 net::DEFAULT_PRIORITY, | 93 net::DEFAULT_PRIORITY, |
| 94 &url_request_delegate_, | 94 &url_request_delegate_, |
| 95 NULL); | 95 NULL); |
| 96 scoped_ptr<ServiceWorkerControlleeRequestHandler> handler( | 96 scoped_ptr<ServiceWorkerControlleeRequestHandler> handler( |
| 97 new ServiceWorkerControlleeRequestHandler( | 97 new ServiceWorkerControlleeRequestHandler( |
| 98 context()->AsWeakPtr(), | 98 context()->AsWeakPtr(), |
| 99 provider_host_, | 99 provider_host_, |
| 100 base::WeakPtr<webkit_blob::BlobStorageContext>(), | 100 base::WeakPtr<storage::BlobStorageContext>(), |
| 101 RESOURCE_TYPE_MAIN_FRAME)); | 101 RESOURCE_TYPE_MAIN_FRAME)); |
| 102 scoped_refptr<net::URLRequestJob> job = | 102 scoped_refptr<net::URLRequestJob> job = |
| 103 handler->MaybeCreateJob(request.get(), NULL); | 103 handler->MaybeCreateJob(request.get(), NULL); |
| 104 ServiceWorkerURLRequestJob* sw_job = | 104 ServiceWorkerURLRequestJob* sw_job = |
| 105 static_cast<ServiceWorkerURLRequestJob*>(job.get()); | 105 static_cast<ServiceWorkerURLRequestJob*>(job.get()); |
| 106 | 106 |
| 107 EXPECT_FALSE(sw_job->ShouldFallbackToNetwork()); | 107 EXPECT_FALSE(sw_job->ShouldFallbackToNetwork()); |
| 108 EXPECT_FALSE(sw_job->ShouldForwardToServiceWorker()); | 108 EXPECT_FALSE(sw_job->ShouldForwardToServiceWorker()); |
| 109 EXPECT_FALSE(version_->HasControllee()); | 109 EXPECT_FALSE(version_->HasControllee()); |
| 110 | 110 |
| 111 base::RunLoop().RunUntilIdle(); | 111 base::RunLoop().RunUntilIdle(); |
| 112 | 112 |
| 113 EXPECT_EQ(ServiceWorkerVersion::ACTIVATED, | 113 EXPECT_EQ(ServiceWorkerVersion::ACTIVATED, |
| 114 version_->status()); | 114 version_->status()); |
| 115 EXPECT_FALSE(sw_job->ShouldFallbackToNetwork()); | 115 EXPECT_FALSE(sw_job->ShouldFallbackToNetwork()); |
| 116 EXPECT_TRUE(sw_job->ShouldForwardToServiceWorker()); | 116 EXPECT_TRUE(sw_job->ShouldForwardToServiceWorker()); |
| 117 EXPECT_TRUE(version_->HasControllee()); | 117 EXPECT_TRUE(version_->HasControllee()); |
| 118 | 118 |
| 119 // Navigations should trigger an update too. | 119 // Navigations should trigger an update too. |
| 120 handler.reset(NULL); | 120 handler.reset(NULL); |
| 121 EXPECT_TRUE(version_->update_timer_.IsRunning()); | 121 EXPECT_TRUE(version_->update_timer_.IsRunning()); |
| 122 } | 122 } |
| 123 | 123 |
| 124 } // namespace content | 124 } // namespace content |
| OLD | NEW |