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 "ppapi/proxy/ppapi_proxy_test.h" | 5 #include "ppapi/proxy/ppapi_proxy_test.h" |
6 | 6 |
7 #include <sstream> | 7 #include <sstream> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
263 const base::SharedMemoryHandle& handle, | 263 const base::SharedMemoryHandle& handle, |
264 base::ProcessId /* remote_pid */) { | 264 base::ProcessId /* remote_pid */) { |
265 return base::SharedMemory::DuplicateHandle(handle); | 265 return base::SharedMemory::DuplicateHandle(handle); |
266 } | 266 } |
267 | 267 |
268 std::set<PP_Instance>* | 268 std::set<PP_Instance>* |
269 PluginProxyTestHarness::PluginDelegateMock::GetGloballySeenInstanceIDSet() { | 269 PluginProxyTestHarness::PluginDelegateMock::GetGloballySeenInstanceIDSet() { |
270 return &instance_id_set_; | 270 return &instance_id_set_; |
271 } | 271 } |
272 | 272 |
273 uint32 PluginProxyTestHarness::PluginDelegateMock::Register( | 273 uint32_t PluginProxyTestHarness::PluginDelegateMock::Register( |
274 PluginDispatcher* plugin_dispatcher) { | 274 PluginDispatcher* plugin_dispatcher) { |
275 return 0; | 275 return 0; |
276 } | 276 } |
277 | 277 |
278 void PluginProxyTestHarness::PluginDelegateMock::Unregister( | 278 void PluginProxyTestHarness::PluginDelegateMock::Unregister( |
279 uint32 plugin_dispatcher_id) { | 279 uint32_t plugin_dispatcher_id) {} |
280 } | |
281 | 280 |
282 IPC::Sender* PluginProxyTestHarness::PluginDelegateMock::GetBrowserSender() { | 281 IPC::Sender* PluginProxyTestHarness::PluginDelegateMock::GetBrowserSender() { |
283 return browser_sender_; | 282 return browser_sender_; |
284 } | 283 } |
285 | 284 |
286 std::string PluginProxyTestHarness::PluginDelegateMock::GetUILanguage() { | 285 std::string PluginProxyTestHarness::PluginDelegateMock::GetUILanguage() { |
287 return std::string("en-US"); | 286 return std::string("en-US"); |
288 } | 287 } |
289 | 288 |
290 void PluginProxyTestHarness::PluginDelegateMock::PreCacheFontForFlash( | 289 void PluginProxyTestHarness::PluginDelegateMock::PreCacheFontForFlash( |
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
582 void TwoWayTest::PostTaskOnRemoteHarness(const base::Closure& task) { | 581 void TwoWayTest::PostTaskOnRemoteHarness(const base::Closure& task) { |
583 base::WaitableEvent task_complete(true, false); | 582 base::WaitableEvent task_complete(true, false); |
584 plugin_thread_.task_runner()->PostTask( | 583 plugin_thread_.task_runner()->PostTask( |
585 FROM_HERE, base::Bind(&RunTaskOnRemoteHarness, task, &task_complete)); | 584 FROM_HERE, base::Bind(&RunTaskOnRemoteHarness, task, &task_complete)); |
586 task_complete.Wait(); | 585 task_complete.Wait(); |
587 } | 586 } |
588 | 587 |
589 | 588 |
590 } // namespace proxy | 589 } // namespace proxy |
591 } // namespace ppapi | 590 } // namespace ppapi |
OLD | NEW |