Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(218)

Side by Side Diff: ppapi/proxy/plugin_var_tracker_unittest.cc

Issue 6995083: Proxy PPB_Var, fix o-o-p string var id tracking. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Updated copyright header Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ppapi/proxy/plugin_var_tracker.cc ('k') | ppapi/proxy/ppb_var_deprecated_proxy.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "ipc/ipc_test_sink.h" 5 #include "ipc/ipc_test_sink.h"
6 #include "ppapi/proxy/plugin_var_tracker.h" 6 #include "ppapi/proxy/plugin_var_tracker.h"
7 #include "ppapi/proxy/ppapi_messages.h" 7 #include "ppapi/proxy/ppapi_messages.h"
8 #include "ppapi/proxy/ppapi_proxy_test.h" 8 #include "ppapi/proxy/ppapi_proxy_test.h"
9 9
10 namespace pp { 10 namespace pp {
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 TEST_F(PluginVarTrackerTest, Strings) { 51 TEST_F(PluginVarTrackerTest, Strings) {
52 std::string str("Hello"); 52 std::string str("Hello");
53 PluginVarTracker::VarID str_id1 = var_tracker().MakeString(str); 53 PluginVarTracker::VarID str_id1 = var_tracker().MakeString(str);
54 EXPECT_NE(0, str_id1); 54 EXPECT_NE(0, str_id1);
55 55
56 PluginVarTracker::VarID str_id2 = var_tracker().MakeString( 56 PluginVarTracker::VarID str_id2 = var_tracker().MakeString(
57 str.c_str(), static_cast<uint32_t>(str.size())); 57 str.c_str(), static_cast<uint32_t>(str.size()));
58 EXPECT_NE(0, str_id2); 58 EXPECT_NE(0, str_id2);
59 59
60 // Make sure the strings come out the other end. 60 // Make sure the strings come out the other end.
61 std::string result = var_tracker().GetString(MakeString(str_id1)); 61 const std::string* result =
62 EXPECT_EQ(str, result); 62 var_tracker().GetExistingString(MakeString(str_id1));
63 result = var_tracker().GetString(MakeString(str_id2)); 63 EXPECT_EQ(str, *result);
64 EXPECT_EQ(str, result); 64 result = var_tracker().GetExistingString(MakeString(str_id2));
65 EXPECT_EQ(str, *result);
65 } 66 }
66 67
67 TEST_F(PluginVarTrackerTest, GetHostObject) { 68 TEST_F(PluginVarTrackerTest, GetHostObject) {
68 PP_Var host_object = MakeObject(12345); 69 PP_Var host_object = MakeObject(12345);
69 70
70 // Round-trip through the tracker to make sure the host object comes out the 71 // Round-trip through the tracker to make sure the host object comes out the
71 // other end. 72 // other end.
72 PP_Var plugin_object = var_tracker().ReceiveObjectPassRef( 73 PP_Var plugin_object = var_tracker().ReceiveObjectPassRef(
73 host_object, plugin_dispatcher()); 74 host_object, plugin_dispatcher());
74 PP_Var host_object2 = var_tracker().GetHostObject(plugin_object); 75 PP_Var host_object2 = var_tracker().GetHostObject(plugin_object);
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 var_tracker().StopTrackingObjectWithNoReference(plugin_var); 180 var_tracker().StopTrackingObjectWithNoReference(plugin_var);
180 EXPECT_EQ(1, 181 EXPECT_EQ(1,
181 var_tracker().GetTrackedWithNoReferenceCountForObject(plugin_var)); 182 var_tracker().GetTrackedWithNoReferenceCountForObject(plugin_var));
182 var_tracker().StopTrackingObjectWithNoReference(plugin_var); 183 var_tracker().StopTrackingObjectWithNoReference(plugin_var);
183 EXPECT_EQ(-1, 184 EXPECT_EQ(-1,
184 var_tracker().GetTrackedWithNoReferenceCountForObject(plugin_var)); 185 var_tracker().GetTrackedWithNoReferenceCountForObject(plugin_var));
185 } 186 }
186 187
187 } // namespace proxy 188 } // namespace proxy
188 } // namespace pp 189 } // namespace pp
OLDNEW
« no previous file with comments | « ppapi/proxy/plugin_var_tracker.cc ('k') | ppapi/proxy/ppb_var_deprecated_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698