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

Unified Diff: ppapi/proxy/plugin_resource_tracker_unittest.cc

Issue 7629017: Add a unified resource tracker shared between the proxy and the impl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments Created 9 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: ppapi/proxy/plugin_resource_tracker_unittest.cc
diff --git a/ppapi/proxy/plugin_resource_tracker_unittest.cc b/ppapi/proxy/plugin_resource_tracker_unittest.cc
index 8295302d54bff22f3e4f53331f864345d9b5a14a..cb2663802abe4adf0d87ebc2920a541508a5a81e 100644
--- a/ppapi/proxy/plugin_resource_tracker_unittest.cc
+++ b/ppapi/proxy/plugin_resource_tracker_unittest.cc
@@ -39,11 +39,6 @@ class PluginResourceTrackerTest : public PluginProxyTest {
public:
PluginResourceTrackerTest() {}
~PluginResourceTrackerTest() {}
-
- PluginResourceTracker& tracker() { return tracker_; }
-
- private:
- PluginResourceTracker tracker_;
};
TEST_F(PluginResourceTrackerTest, PluginResourceForHostResource) {
@@ -53,22 +48,22 @@ TEST_F(PluginResourceTrackerTest, PluginResourceForHostResource) {
serialized.SetHostResource(pp_instance(), host_resource);
// When we haven't added an object, the return value should be 0.
- EXPECT_EQ(0, tracker().PluginResourceForHostResource(serialized));
+ EXPECT_EQ(0, resource_tracker().PluginResourceForHostResource(serialized));
EXPECT_EQ(0, TrackedMockResource::tracked_alive_count);
TrackedMockResource* object = new TrackedMockResource(serialized);
EXPECT_EQ(1, TrackedMockResource::tracked_alive_count);
- PP_Resource plugin_resource = tracker().AddResource(object);
+ PP_Resource plugin_resource = object->GetReference();
// Now that the object has been added, the return value should be the plugin
// resource ID we already got.
EXPECT_EQ(plugin_resource,
- tracker().PluginResourceForHostResource(serialized));
+ resource_tracker().PluginResourceForHostResource(serialized));
// Releasing the resource should have freed it.
- tracker().ReleaseResource(plugin_resource);
+ resource_tracker().ReleaseResource(plugin_resource);
EXPECT_EQ(0, TrackedMockResource::tracked_alive_count);
- EXPECT_EQ(0, tracker().PluginResourceForHostResource(serialized));
+ EXPECT_EQ(0, resource_tracker().PluginResourceForHostResource(serialized));
}
} // namespace proxy

Powered by Google App Engine
This is Rietveld 408576698