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/process_util.h" | 7 #include "base/process_util.h" |
8 #include "base/message_loop_proxy.h" | 8 #include "base/message_loop_proxy.h" |
9 #include "content/common/view_messages.h" | 9 #include "content/common/view_messages.h" |
10 #include "ipc/ipc_message_utils.h" | 10 #include "ipc/ipc_message_utils.h" |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
134 | 134 |
135 void MockRenderThread::WidgetRestored() { | 135 void MockRenderThread::WidgetRestored() { |
136 } | 136 } |
137 | 137 |
138 void MockRenderThread::EnsureWebKitInitialized() { | 138 void MockRenderThread::EnsureWebKitInitialized() { |
139 } | 139 } |
140 | 140 |
141 void MockRenderThread::RecordUserMetrics(const std::string& action) { | 141 void MockRenderThread::RecordUserMetrics(const std::string& action) { |
142 } | 142 } |
143 | 143 |
144 base::SharedMemoryHandle MockRenderThread::HostAllocateSharedMemoryBuffer( | 144 scoped_ptr<base::SharedMemory> |
145 uint32 buffer_size) { | 145 MockRenderThread::HostAllocateSharedMemoryBuffer( |
146 base::SharedMemory shared_buf; | 146 uint32 buffer_size) { |
147 if (!shared_buf.CreateAndMapAnonymous(buffer_size)) { | 147 scoped_ptr<base::SharedMemory> shared_buf(new base::SharedMemory); |
| 148 if (!shared_buf->CreateAndMapAnonymous(buffer_size)) { |
148 NOTREACHED() << "Cannot map shared memory buffer"; | 149 NOTREACHED() << "Cannot map shared memory buffer"; |
149 return base::SharedMemory::NULLHandle(); | 150 return scoped_ptr<base::SharedMemory>(); |
150 } | 151 } |
151 base::SharedMemoryHandle handle; | 152 |
152 shared_buf.GiveToProcess(base::GetCurrentProcessHandle(), &handle); | 153 return scoped_ptr<base::SharedMemory>(shared_buf.release()); |
153 return handle; | |
154 } | 154 } |
155 | 155 |
156 void MockRenderThread::RegisterExtension(v8::Extension* extension) { | 156 void MockRenderThread::RegisterExtension(v8::Extension* extension) { |
157 } | 157 } |
158 | 158 |
159 void MockRenderThread::ScheduleIdleHandler(int64 initial_delay_ms) { | 159 void MockRenderThread::ScheduleIdleHandler(int64 initial_delay_ms) { |
160 } | 160 } |
161 | 161 |
162 void MockRenderThread::IdleHandler() { | 162 void MockRenderThread::IdleHandler() { |
163 } | 163 } |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
229 void MockRenderThread::OnDuplicateSection( | 229 void MockRenderThread::OnDuplicateSection( |
230 base::SharedMemoryHandle renderer_handle, | 230 base::SharedMemoryHandle renderer_handle, |
231 base::SharedMemoryHandle* browser_handle) { | 231 base::SharedMemoryHandle* browser_handle) { |
232 // We don't have to duplicate the input handles since RenderViewTest does not | 232 // We don't have to duplicate the input handles since RenderViewTest does not |
233 // separate a browser process from a renderer process. | 233 // separate a browser process from a renderer process. |
234 *browser_handle = renderer_handle; | 234 *browser_handle = renderer_handle; |
235 } | 235 } |
236 #endif // defined(OS_WIN) | 236 #endif // defined(OS_WIN) |
237 | 237 |
238 } // namespace content | 238 } // namespace content |
OLD | NEW |