OLD | NEW |
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/single_thread_task_runner.h" | 7 #include "base/message_loop/message_loop_proxy.h" |
8 #include "base/thread_task_runner_handle.h" | |
9 #include "content/common/frame_messages.h" | 8 #include "content/common/frame_messages.h" |
10 #include "content/common/view_messages.h" | 9 #include "content/common/view_messages.h" |
11 #include "content/public/renderer/render_process_observer.h" | 10 #include "content/public/renderer/render_process_observer.h" |
12 #include "content/renderer/render_view_impl.h" | 11 #include "content/renderer/render_view_impl.h" |
13 #include "ipc/ipc_message_utils.h" | 12 #include "ipc/ipc_message_utils.h" |
14 #include "ipc/ipc_sync_message.h" | 13 #include "ipc/ipc_sync_message.h" |
15 #include "ipc/message_filter.h" | 14 #include "ipc/message_filter.h" |
16 #include "testing/gtest/include/gtest/gtest.h" | 15 #include "testing/gtest/include/gtest/gtest.h" |
17 #include "third_party/WebKit/public/web/WebScriptController.h" | 16 #include "third_party/WebKit/public/web/WebScriptController.h" |
18 | 17 |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 if (msg->routing_id() == MSG_ROUTING_CONTROL) | 56 if (msg->routing_id() == MSG_ROUTING_CONTROL) |
58 OnControlMessageReceived(*msg); | 57 OnControlMessageReceived(*msg); |
59 else | 58 else |
60 OnMessageReceived(*msg); | 59 OnMessageReceived(*msg); |
61 } | 60 } |
62 delete msg; | 61 delete msg; |
63 return true; | 62 return true; |
64 } | 63 } |
65 | 64 |
66 scoped_refptr<base::SingleThreadTaskRunner> MockRenderThread::GetTaskRunner() { | 65 scoped_refptr<base::SingleThreadTaskRunner> MockRenderThread::GetTaskRunner() { |
67 return base::ThreadTaskRunnerHandle::Get(); | 66 return base::MessageLoopProxy::current(); |
68 } | 67 } |
69 | 68 |
70 IPC::SyncChannel* MockRenderThread::GetChannel() { | 69 IPC::SyncChannel* MockRenderThread::GetChannel() { |
71 return NULL; | 70 return NULL; |
72 } | 71 } |
73 | 72 |
74 std::string MockRenderThread::GetLocale() { | 73 std::string MockRenderThread::GetLocale() { |
75 return "en-US"; | 74 return "en-US"; |
76 } | 75 } |
77 | 76 |
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
262 void MockRenderThread::OnDuplicateSection( | 261 void MockRenderThread::OnDuplicateSection( |
263 base::SharedMemoryHandle renderer_handle, | 262 base::SharedMemoryHandle renderer_handle, |
264 base::SharedMemoryHandle* browser_handle) { | 263 base::SharedMemoryHandle* browser_handle) { |
265 // We don't have to duplicate the input handles since RenderViewTest does not | 264 // We don't have to duplicate the input handles since RenderViewTest does not |
266 // separate a browser process from a renderer process. | 265 // separate a browser process from a renderer process. |
267 *browser_handle = renderer_handle; | 266 *browser_handle = renderer_handle; |
268 } | 267 } |
269 #endif // defined(OS_WIN) | 268 #endif // defined(OS_WIN) |
270 | 269 |
271 } // namespace content | 270 } // namespace content |
OLD | NEW |