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

Side by Side Diff: content/browser/service_worker/embedded_worker_test_helper.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, 11 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 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 "content/browser/service_worker/embedded_worker_test_helper.h" 5 #include "content/browser/service_worker/embedded_worker_test_helper.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility>
9 10
10 #include "base/atomic_sequence_num.h" 11 #include "base/atomic_sequence_num.h"
11 #include "base/bind.h" 12 #include "base/bind.h"
12 #include "base/memory/scoped_vector.h" 13 #include "base/memory/scoped_vector.h"
13 #include "base/thread_task_runner_handle.h" 14 #include "base/thread_task_runner_handle.h"
14 #include "content/browser/message_port_message_filter.h" 15 #include "content/browser/message_port_message_filter.h"
15 #include "content/browser/service_worker/embedded_worker_instance.h" 16 #include "content/browser/service_worker/embedded_worker_instance.h"
16 #include "content/browser/service_worker/embedded_worker_registry.h" 17 #include "content/browser/service_worker/embedded_worker_registry.h"
17 #include "content/browser/service_worker/service_worker_context_core.h" 18 #include "content/browser/service_worker/service_worker_context_core.h"
18 #include "content/browser/service_worker/service_worker_context_wrapper.h" 19 #include "content/browser/service_worker/service_worker_context_wrapper.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 const base::FilePath& user_data_directory) 51 const base::FilePath& user_data_directory)
51 : browser_context_(new TestBrowserContext), 52 : browser_context_(new TestBrowserContext),
52 render_process_host_(new MockRenderProcessHost(browser_context_.get())), 53 render_process_host_(new MockRenderProcessHost(browser_context_.get())),
53 wrapper_(new ServiceWorkerContextWrapper(browser_context_.get())), 54 wrapper_(new ServiceWorkerContextWrapper(browser_context_.get())),
54 next_thread_id_(0), 55 next_thread_id_(0),
55 mock_render_process_id_(render_process_host_->GetID()), 56 mock_render_process_id_(render_process_host_->GetID()),
56 weak_factory_(this) { 57 weak_factory_(this) {
57 scoped_ptr<MockServiceWorkerDatabaseTaskManager> database_task_manager( 58 scoped_ptr<MockServiceWorkerDatabaseTaskManager> database_task_manager(
58 new MockServiceWorkerDatabaseTaskManager( 59 new MockServiceWorkerDatabaseTaskManager(
59 base::ThreadTaskRunnerHandle::Get())); 60 base::ThreadTaskRunnerHandle::Get()));
60 wrapper_->InitInternal(user_data_directory, database_task_manager.Pass(), 61 wrapper_->InitInternal(user_data_directory, std::move(database_task_manager),
61 base::ThreadTaskRunnerHandle::Get(), nullptr, nullptr); 62 base::ThreadTaskRunnerHandle::Get(), nullptr, nullptr);
62 wrapper_->process_manager()->SetProcessIdForTest(mock_render_process_id_); 63 wrapper_->process_manager()->SetProcessIdForTest(mock_render_process_id_);
63 registry()->AddChildProcessSender(mock_render_process_id_, this, 64 registry()->AddChildProcessSender(mock_render_process_id_, this,
64 NewMessagePortMessageFilter()); 65 NewMessagePortMessageFilter());
65 } 66 }
66 67
67 EmbeddedWorkerTestHelper::~EmbeddedWorkerTestHelper() { 68 EmbeddedWorkerTestHelper::~EmbeddedWorkerTestHelper() {
68 if (wrapper_.get()) 69 if (wrapper_.get())
69 wrapper_->Shutdown(); 70 wrapper_->Shutdown();
70 } 71 }
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 344
344 MessagePortMessageFilter* 345 MessagePortMessageFilter*
345 EmbeddedWorkerTestHelper::NewMessagePortMessageFilter() { 346 EmbeddedWorkerTestHelper::NewMessagePortMessageFilter() {
346 scoped_refptr<MessagePortMessageFilter> filter( 347 scoped_refptr<MessagePortMessageFilter> filter(
347 new MockMessagePortMessageFilter); 348 new MockMessagePortMessageFilter);
348 message_port_message_filters_.push_back(filter); 349 message_port_message_filters_.push_back(filter);
349 return filter.get(); 350 return filter.get();
350 } 351 }
351 352
352 } // namespace content 353 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698