| 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 "ppapi/proxy/serialized_var.h" | 7 #include "ppapi/proxy/serialized_var.h" |
| 8 #include "ppapi/shared_impl/proxy_lock.h" | 8 #include "ppapi/shared_impl/proxy_lock.h" |
| 9 | 9 |
| 10 namespace ppapi { | 10 namespace ppapi { |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 194 EXPECT_EQ(2u, sink().message_count()); | 194 EXPECT_EQ(2u, sink().message_count()); |
| 195 } | 195 } |
| 196 | 196 |
| 197 // Since we didn't keep any refs to the objects, it should have freed the | 197 // Since we didn't keep any refs to the objects, it should have freed the |
| 198 // object. | 198 // object. |
| 199 EXPECT_EQ(-1, var_tracker().GetRefCountForObject(plugin_object)); | 199 EXPECT_EQ(-1, var_tracker().GetRefCountForObject(plugin_object)); |
| 200 } | 200 } |
| 201 | 201 |
| 202 // Tests the case that the plugin receives the same vars twice as an input | 202 // Tests the case that the plugin receives the same vars twice as an input |
| 203 // parameter (not passing ownership) within a vector. | 203 // parameter (not passing ownership) within a vector. |
| 204 TEST_F(SerializedVarTest, PluginVectorReceiveInput) { | 204 TEST_F(SerializedVarTest, DISABLED_PluginVectorReceiveInput) { |
| 205 ProxyAutoLock lock; | 205 ProxyAutoLock lock; |
| 206 PP_Var host_object = MakeObjectVar(0x31337); | 206 PP_Var host_object = MakeObjectVar(0x31337); |
| 207 | 207 |
| 208 PP_Var* plugin_objects; | 208 PP_Var* plugin_objects; |
| 209 PP_Var* plugin_objects2; | 209 PP_Var* plugin_objects2; |
| 210 { | 210 { |
| 211 // Receive the params. The object should be tracked with no refcount and | 211 // Receive the params. The object should be tracked with no refcount and |
| 212 // no messages sent. The string should is plugin-side only and should have | 212 // no messages sent. The string should is plugin-side only and should have |
| 213 // a reference-count of 1. | 213 // a reference-count of 1. |
| 214 std::vector<SerializedVar> input1; | 214 std::vector<SerializedVar> input1; |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 339 } | 339 } |
| 340 | 340 |
| 341 // When the ReturnValue object goes out of scope, it should have sent a | 341 // When the ReturnValue object goes out of scope, it should have sent a |
| 342 // release message to the browser. | 342 // release message to the browser. |
| 343 EXPECT_EQ(-1, var_tracker().GetRefCountForObject(plugin_object)); | 343 EXPECT_EQ(-1, var_tracker().GetRefCountForObject(plugin_object)); |
| 344 EXPECT_EQ(1u, sink().message_count()); | 344 EXPECT_EQ(1u, sink().message_count()); |
| 345 } | 345 } |
| 346 | 346 |
| 347 } // namespace proxy | 347 } // namespace proxy |
| 348 } // namespace ppapi | 348 } // namespace ppapi |
| OLD | NEW |