Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(170)

Side by Side Diff: content/browser/service_worker/service_worker_storage_unittest.cc

Issue 1545243002: Convert Pass()→std::move() in //content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "content/browser/service_worker/service_worker_storage.h"
6
5 #include <stdint.h> 7 #include <stdint.h>
6
7 #include <string> 8 #include <string>
9 #include <utility>
8 10
9 #include "base/files/file_util.h" 11 #include "base/files/file_util.h"
10 #include "base/files/scoped_temp_dir.h" 12 #include "base/files/scoped_temp_dir.h"
11 #include "base/logging.h" 13 #include "base/logging.h"
12 #include "base/macros.h" 14 #include "base/macros.h"
13 #include "base/run_loop.h" 15 #include "base/run_loop.h"
14 #include "base/thread_task_runner_handle.h" 16 #include "base/thread_task_runner_handle.h"
15 #include "build/build_config.h" 17 #include "build/build_config.h"
16 #include "content/browser/browser_thread_impl.h" 18 #include "content/browser/browser_thread_impl.h"
17 #include "content/browser/service_worker/service_worker_context_core.h" 19 #include "content/browser/service_worker/service_worker_context_core.h"
18 #include "content/browser/service_worker/service_worker_disk_cache.h" 20 #include "content/browser/service_worker/service_worker_disk_cache.h"
19 #include "content/browser/service_worker/service_worker_registration.h" 21 #include "content/browser/service_worker/service_worker_registration.h"
20 #include "content/browser/service_worker/service_worker_storage.h"
21 #include "content/browser/service_worker/service_worker_version.h" 22 #include "content/browser/service_worker/service_worker_version.h"
22 #include "content/common/service_worker/service_worker_status_code.h" 23 #include "content/common/service_worker/service_worker_status_code.h"
23 #include "content/common/service_worker/service_worker_utils.h" 24 #include "content/common/service_worker/service_worker_utils.h"
24 #include "content/public/test/test_browser_thread_bundle.h" 25 #include "content/public/test/test_browser_thread_bundle.h"
25 #include "ipc/ipc_message.h" 26 #include "ipc/ipc_message.h"
26 #include "net/base/io_buffer.h" 27 #include "net/base/io_buffer.h"
27 #include "net/base/net_errors.h" 28 #include "net/base/net_errors.h"
28 #include "net/base/test_completion_callback.h" 29 #include "net/base/test_completion_callback.h"
29 #include "net/http/http_response_headers.h" 30 #include "net/http/http_response_headers.h"
30 #include "testing/gtest/include/gtest/gtest.h" 31 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 class ServiceWorkerStorageTest : public testing::Test { 273 class ServiceWorkerStorageTest : public testing::Test {
273 public: 274 public:
274 ServiceWorkerStorageTest() 275 ServiceWorkerStorageTest()
275 : browser_thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP) { 276 : browser_thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP) {
276 } 277 }
277 278
278 void SetUp() override { 279 void SetUp() override {
279 scoped_ptr<ServiceWorkerDatabaseTaskManager> database_task_manager( 280 scoped_ptr<ServiceWorkerDatabaseTaskManager> database_task_manager(
280 new MockServiceWorkerDatabaseTaskManager( 281 new MockServiceWorkerDatabaseTaskManager(
281 base::ThreadTaskRunnerHandle::Get())); 282 base::ThreadTaskRunnerHandle::Get()));
282 context_.reset( 283 context_.reset(new ServiceWorkerContextCore(
283 new ServiceWorkerContextCore(GetUserDataDirectory(), 284 GetUserDataDirectory(), std::move(database_task_manager),
284 database_task_manager.Pass(), 285 base::ThreadTaskRunnerHandle::Get(), NULL, NULL, NULL, NULL));
285 base::ThreadTaskRunnerHandle::Get(),
286 NULL,
287 NULL,
288 NULL,
289 NULL));
290 context_ptr_ = context_->AsWeakPtr(); 286 context_ptr_ = context_->AsWeakPtr();
291 } 287 }
292 288
293 void TearDown() override { context_.reset(); } 289 void TearDown() override { context_.reset(); }
294 290
295 base::FilePath GetUserDataDirectory() { return user_data_directory_.path(); } 291 base::FilePath GetUserDataDirectory() { return user_data_directory_.path(); }
296 292
297 bool InitUserDataDirectory() { 293 bool InitUserDataDirectory() {
298 return user_data_directory_.CreateUniqueTempDir(); 294 return user_data_directory_.CreateUniqueTempDir();
299 } 295 }
(...skipping 907 matching lines...) Expand 10 before | Expand all | Expand 10 after
1207 WriteBasicResponse(storage(), kStaleUncommittedResourceId); 1203 WriteBasicResponse(storage(), kStaleUncommittedResourceId);
1208 EXPECT_TRUE( 1204 EXPECT_TRUE(
1209 VerifyBasicResponse(storage(), kStaleUncommittedResourceId, true)); 1205 VerifyBasicResponse(storage(), kStaleUncommittedResourceId, true));
1210 1206
1211 // Simulate browser shutdown. The purgeable and uncommitted resources are now 1207 // Simulate browser shutdown. The purgeable and uncommitted resources are now
1212 // stale. 1208 // stale.
1213 context_.reset(); 1209 context_.reset();
1214 scoped_ptr<ServiceWorkerDatabaseTaskManager> database_task_manager( 1210 scoped_ptr<ServiceWorkerDatabaseTaskManager> database_task_manager(
1215 new MockServiceWorkerDatabaseTaskManager( 1211 new MockServiceWorkerDatabaseTaskManager(
1216 base::ThreadTaskRunnerHandle::Get())); 1212 base::ThreadTaskRunnerHandle::Get()));
1217 context_.reset( 1213 context_.reset(new ServiceWorkerContextCore(
1218 new ServiceWorkerContextCore(GetUserDataDirectory(), 1214 GetUserDataDirectory(), std::move(database_task_manager),
1219 database_task_manager.Pass(), 1215 base::ThreadTaskRunnerHandle::Get(), NULL, NULL, NULL, NULL));
1220 base::ThreadTaskRunnerHandle::Get(),
1221 NULL,
1222 NULL,
1223 NULL,
1224 NULL));
1225 storage()->LazyInitialize(base::Bind(&base::DoNothing)); 1216 storage()->LazyInitialize(base::Bind(&base::DoNothing));
1226 base::RunLoop().RunUntilIdle(); 1217 base::RunLoop().RunUntilIdle();
1227 1218
1228 // Store a new uncommitted resource. This triggers stale resource cleanup. 1219 // Store a new uncommitted resource. This triggers stale resource cleanup.
1229 int64_t kNewResourceId = storage()->NewResourceId(); 1220 int64_t kNewResourceId = storage()->NewResourceId();
1230 WriteBasicResponse(storage(), kNewResourceId); 1221 WriteBasicResponse(storage(), kNewResourceId);
1231 storage()->StoreUncommittedResourceId(kNewResourceId); 1222 storage()->StoreUncommittedResourceId(kNewResourceId);
1232 base::RunLoop().RunUntilIdle(); 1223 base::RunLoop().RunUntilIdle();
1233 1224
1234 // The stale resources should be purged, but the new resource should persist. 1225 // The stale resources should be purged, but the new resource should persist.
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
1574 live_version1 = nullptr; 1565 live_version1 = nullptr;
1575 live_registration2 = nullptr; 1566 live_registration2 = nullptr;
1576 live_version2 = nullptr; 1567 live_version2 = nullptr;
1577 live_registration3 = nullptr; 1568 live_registration3 = nullptr;
1578 live_version3 = nullptr; 1569 live_version3 = nullptr;
1579 context_.reset(); 1570 context_.reset();
1580 scoped_ptr<ServiceWorkerDatabaseTaskManager> database_task_manager( 1571 scoped_ptr<ServiceWorkerDatabaseTaskManager> database_task_manager(
1581 new MockServiceWorkerDatabaseTaskManager( 1572 new MockServiceWorkerDatabaseTaskManager(
1582 base::ThreadTaskRunnerHandle::Get())); 1573 base::ThreadTaskRunnerHandle::Get()));
1583 context_.reset(new ServiceWorkerContextCore( 1574 context_.reset(new ServiceWorkerContextCore(
1584 GetUserDataDirectory(), database_task_manager.Pass(), 1575 GetUserDataDirectory(), std::move(database_task_manager),
1585 base::ThreadTaskRunnerHandle::Get(), nullptr, nullptr, nullptr, nullptr)); 1576 base::ThreadTaskRunnerHandle::Get(), nullptr, nullptr, nullptr, nullptr));
1586 LazyInitialize(); 1577 LazyInitialize();
1587 1578
1588 // First origin should still have a registration left. 1579 // First origin should still have a registration left.
1589 EXPECT_TRUE(storage()->OriginHasForeignFetchRegistrations(kOrigin1)); 1580 EXPECT_TRUE(storage()->OriginHasForeignFetchRegistrations(kOrigin1));
1590 EXPECT_FALSE(storage()->OriginHasForeignFetchRegistrations(kOrigin2)); 1581 EXPECT_FALSE(storage()->OriginHasForeignFetchRegistrations(kOrigin2));
1591 1582
1592 // Remove other registration at first origin. 1583 // Remove other registration at first origin.
1593 EXPECT_EQ(SERVICE_WORKER_OK, 1584 EXPECT_EQ(SERVICE_WORKER_OK,
1594 DeleteRegistration(kRegistrationId2, kScope2.GetOrigin())); 1585 DeleteRegistration(kRegistrationId2, kScope2.GetOrigin()));
1595 1586
1596 // No foreign fetch registrations remain. 1587 // No foreign fetch registrations remain.
1597 EXPECT_FALSE(storage()->OriginHasForeignFetchRegistrations(kOrigin1)); 1588 EXPECT_FALSE(storage()->OriginHasForeignFetchRegistrations(kOrigin1));
1598 EXPECT_FALSE(storage()->OriginHasForeignFetchRegistrations(kOrigin2)); 1589 EXPECT_FALSE(storage()->OriginHasForeignFetchRegistrations(kOrigin2));
1599 } 1590 }
1600 1591
1601 } // namespace content 1592 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698