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