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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
135 sink().GetUniqueMessageMatching(IPC_REPLY_ID); | 135 sink().GetUniqueMessageMatching(IPC_REPLY_ID); |
136 EXPECT_TRUE(reply_msg); | 136 EXPECT_TRUE(reply_msg); |
137 if (!reply_msg) | 137 if (!reply_msg) |
138 return false; | 138 return false; |
139 | 139 |
140 TupleTypes<PpapiMsg_SupportsInterface::ReplyParam>::ValueTuple reply_data; | 140 TupleTypes<PpapiMsg_SupportsInterface::ReplyParam>::ValueTuple reply_data; |
141 EXPECT_TRUE(PpapiMsg_SupportsInterface::ReadReplyParam( | 141 EXPECT_TRUE(PpapiMsg_SupportsInterface::ReadReplyParam( |
142 reply_msg, &reply_data)); | 142 reply_msg, &reply_data)); |
143 | 143 |
144 sink().ClearMessages(); | 144 sink().ClearMessages(); |
145 return reply_data.a; | 145 return get<0>(reply_data); |
146 } | 146 } |
147 | 147 |
148 // PluginProxyTestHarness ------------------------------------------------------ | 148 // PluginProxyTestHarness ------------------------------------------------------ |
149 | 149 |
150 PluginProxyTestHarness::PluginProxyTestHarness( | 150 PluginProxyTestHarness::PluginProxyTestHarness( |
151 GlobalsConfiguration globals_config) | 151 GlobalsConfiguration globals_config) |
152 : globals_config_(globals_config) { | 152 : globals_config_(globals_config) { |
153 } | 153 } |
154 | 154 |
155 PluginProxyTestHarness::~PluginProxyTestHarness() { | 155 PluginProxyTestHarness::~PluginProxyTestHarness() { |
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
582 plugin_thread_.message_loop_proxy()->PostTask(FROM_HERE, | 582 plugin_thread_.message_loop_proxy()->PostTask(FROM_HERE, |
583 base::Bind(&RunTaskOnRemoteHarness, | 583 base::Bind(&RunTaskOnRemoteHarness, |
584 task, | 584 task, |
585 &task_complete)); | 585 &task_complete)); |
586 task_complete.Wait(); | 586 task_complete.Wait(); |
587 } | 587 } |
588 | 588 |
589 | 589 |
590 } // namespace proxy | 590 } // namespace proxy |
591 } // namespace ppapi | 591 } // namespace ppapi |
OLD | NEW |