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

Side by Side Diff: content/public/test/mock_render_thread.cc

Issue 2456493003: Add frame-specific InterfaceProviderSpec. (Closed)
Patch Set: . Created 4 years, 1 month 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/public/test/mock_render_thread.h" 5 #include "content/public/test/mock_render_thread.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/single_thread_task_runner.h" 8 #include "base/single_thread_task_runner.h"
9 #include "base/threading/thread_task_runner_handle.h" 9 #include "base/threading/thread_task_runner_handle.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
11 #include "content/common/frame_messages.h" 11 #include "content/common/frame_messages.h"
12 #include "content/common/render_message_filter.mojom.h" 12 #include "content/common/render_message_filter.mojom.h"
13 #include "content/common/view_messages.h" 13 #include "content/common/view_messages.h"
14 #include "content/public/renderer/render_thread_observer.h" 14 #include "content/public/renderer/render_thread_observer.h"
15 #include "content/renderer/render_thread_impl.h" 15 #include "content/renderer/render_thread_impl.h"
16 #include "content/renderer/render_view_impl.h" 16 #include "content/renderer/render_view_impl.h"
17 #include "ipc/ipc_message_utils.h" 17 #include "ipc/ipc_message_utils.h"
18 #include "ipc/ipc_sync_message.h" 18 #include "ipc/ipc_sync_message.h"
19 #include "ipc/message_filter.h" 19 #include "ipc/message_filter.h"
20 #include "services/service_manager/public/cpp/interface_provider.h" 20 #include "services/service_manager/public/cpp/interface_provider.h"
21 #include "services/service_manager/public/cpp/interface_registry.h" 21 #include "services/service_manager/public/cpp/interface_registry.h"
22 #include "services/service_manager/public/interfaces/interface_provider_spec.moj om.h"
22 #include "testing/gtest/include/gtest/gtest.h" 23 #include "testing/gtest/include/gtest/gtest.h"
23 #include "third_party/WebKit/public/web/WebScriptController.h" 24 #include "third_party/WebKit/public/web/WebScriptController.h"
24 25
25 namespace content { 26 namespace content {
26 27
27 namespace { 28 namespace {
28 29
29 class MockRenderMessageFilterImpl : public mojom::RenderMessageFilter { 30 class MockRenderMessageFilterImpl : public mojom::RenderMessageFilter {
30 public: 31 public:
31 explicit MockRenderMessageFilterImpl(MockRenderThread* thread) 32 explicit MockRenderMessageFilterImpl(MockRenderThread* thread)
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 228
228 #endif // OS_WIN 229 #endif // OS_WIN
229 230
230 ServiceManagerConnection* MockRenderThread::GetServiceManagerConnection() { 231 ServiceManagerConnection* MockRenderThread::GetServiceManagerConnection() {
231 return nullptr; 232 return nullptr;
232 } 233 }
233 234
234 service_manager::InterfaceRegistry* MockRenderThread::GetInterfaceRegistry() { 235 service_manager::InterfaceRegistry* MockRenderThread::GetInterfaceRegistry() {
235 if (!interface_registry_) { 236 if (!interface_registry_) {
236 interface_registry_ = base::MakeUnique<service_manager::InterfaceRegistry>( 237 interface_registry_ = base::MakeUnique<service_manager::InterfaceRegistry>(
237 service_manager::Identity(), service_manager::InterfaceProviderSpec()); 238 service_manager::mojom::kServiceManager_ConnectorSpec);
238 } 239 }
239 return interface_registry_.get(); 240 return interface_registry_.get();
240 } 241 }
241 242
242 service_manager::InterfaceProvider* MockRenderThread::GetRemoteInterfaces() { 243 service_manager::InterfaceProvider* MockRenderThread::GetRemoteInterfaces() {
243 if (!remote_interfaces_) { 244 if (!remote_interfaces_) {
244 service_manager::mojom::InterfaceProviderPtr remote_interface_provider; 245 service_manager::mojom::InterfaceProviderPtr remote_interface_provider;
245 pending_remote_interface_provider_request_ = 246 pending_remote_interface_provider_request_ =
246 GetProxy(&remote_interface_provider); 247 GetProxy(&remote_interface_provider);
247 remote_interfaces_.reset(new service_manager::InterfaceProvider); 248 remote_interfaces_.reset(new service_manager::InterfaceProvider);
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 void MockRenderThread::OnCreateWindow( 306 void MockRenderThread::OnCreateWindow(
306 const mojom::CreateNewWindowParams& params, 307 const mojom::CreateNewWindowParams& params,
307 mojom::CreateNewWindowReply* reply) { 308 mojom::CreateNewWindowReply* reply) {
308 reply->route_id = new_window_routing_id_; 309 reply->route_id = new_window_routing_id_;
309 reply->main_frame_route_id = new_window_main_frame_routing_id_; 310 reply->main_frame_route_id = new_window_main_frame_routing_id_;
310 reply->main_frame_widget_route_id = new_window_main_frame_widget_routing_id_; 311 reply->main_frame_widget_route_id = new_window_main_frame_widget_routing_id_;
311 reply->cloned_session_storage_namespace_id = 0; 312 reply->cloned_session_storage_namespace_id = 0;
312 } 313 }
313 314
314 } // namespace content 315 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/service_manager_connection.h ('k') | content/renderer/render_frame_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698