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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
128 bool unused_result = false; | 128 bool unused_result = false; |
129 PpapiMsg_SupportsInterface msg(name, &unused_result); | 129 PpapiMsg_SupportsInterface msg(name, &unused_result); |
130 GetDispatcher()->OnMessageReceived(msg); | 130 GetDispatcher()->OnMessageReceived(msg); |
131 | 131 |
132 const IPC::Message* reply_msg = | 132 const IPC::Message* reply_msg = |
133 sink().GetUniqueMessageMatching(IPC_REPLY_ID); | 133 sink().GetUniqueMessageMatching(IPC_REPLY_ID); |
134 EXPECT_TRUE(reply_msg); | 134 EXPECT_TRUE(reply_msg); |
135 if (!reply_msg) | 135 if (!reply_msg) |
136 return false; | 136 return false; |
137 | 137 |
138 TupleTypes<PpapiMsg_SupportsInterface::ReplyParam>::ValueTuple reply_data; | 138 base::TupleTypes<PpapiMsg_SupportsInterface::ReplyParam>::ValueTuple |
| 139 reply_data; |
139 EXPECT_TRUE(PpapiMsg_SupportsInterface::ReadReplyParam( | 140 EXPECT_TRUE(PpapiMsg_SupportsInterface::ReadReplyParam( |
140 reply_msg, &reply_data)); | 141 reply_msg, &reply_data)); |
141 | 142 |
142 sink().ClearMessages(); | 143 sink().ClearMessages(); |
143 return get<0>(reply_data); | 144 return base::get<0>(reply_data); |
144 } | 145 } |
145 | 146 |
146 // PluginProxyTestHarness ------------------------------------------------------ | 147 // PluginProxyTestHarness ------------------------------------------------------ |
147 | 148 |
148 PluginProxyTestHarness::PluginProxyTestHarness( | 149 PluginProxyTestHarness::PluginProxyTestHarness( |
149 GlobalsConfiguration globals_config) | 150 GlobalsConfiguration globals_config) |
150 : globals_config_(globals_config) { | 151 : globals_config_(globals_config) { |
151 } | 152 } |
152 | 153 |
153 PluginProxyTestHarness::~PluginProxyTestHarness() { | 154 PluginProxyTestHarness::~PluginProxyTestHarness() { |
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
576 plugin_thread_.message_loop_proxy()->PostTask(FROM_HERE, | 577 plugin_thread_.message_loop_proxy()->PostTask(FROM_HERE, |
577 base::Bind(&RunTaskOnRemoteHarness, | 578 base::Bind(&RunTaskOnRemoteHarness, |
578 task, | 579 task, |
579 &task_complete)); | 580 &task_complete)); |
580 task_complete.Wait(); | 581 task_complete.Wait(); |
581 } | 582 } |
582 | 583 |
583 | 584 |
584 } // namespace proxy | 585 } // namespace proxy |
585 } // namespace ppapi | 586 } // namespace ppapi |
OLD | NEW |