summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy/ppp_instance_private_proxy_unittest.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-20 19:09:20 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-20 19:09:20 +0000
commit794d83cda5183b25665e99296ab6f5e6c1dbf2dc (patch)
tree5b69cd2fa55d7eb0ac3c9a98f1012358e2f349b2 /ppapi/proxy/ppp_instance_private_proxy_unittest.cc
parent83c23571249a13c68d07122070bf73c2a9cd435e (diff)
downloadchromium_src-794d83cda5183b25665e99296ab6f5e6c1dbf2dc.zip
chromium_src-794d83cda5183b25665e99296ab6f5e6c1dbf2dc.tar.gz
chromium_src-794d83cda5183b25665e99296ab6f5e6c1dbf2dc.tar.bz2
Add a new globals object for PPAPI tracking information.
[ Reland of 106142: http://codereview.chromium.org/8316008 ] This adds a specialization on the host and plugin side of the proxy. This replaces the ad-hoc singleton tracking done by the resource and var trackers with just being getters on this global object. Most code can use the single PpapiGlobals class. I also allow code to get the host and plugin specializations since some code needs access to some specific features of each side. In a later pass I'll move the other stuff out of TrackerBase and delete it. TEST=none BUG=none Review URL: http://codereview.chromium.org/8344025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106537 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/ppp_instance_private_proxy_unittest.cc')
-rw-r--r--ppapi/proxy/ppp_instance_private_proxy_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ppapi/proxy/ppp_instance_private_proxy_unittest.cc b/ppapi/proxy/ppp_instance_private_proxy_unittest.cc
index a192154..ea57ec1 100644
--- a/ppapi/proxy/ppp_instance_private_proxy_unittest.cc
+++ b/ppapi/proxy/ppp_instance_private_proxy_unittest.cc
@@ -156,7 +156,7 @@ TEST_F(PPP_Instance_Private_ProxyTest, PPPInstancePrivate) {
// Now instance_obj is valid and should have a ref-count of 1.
PluginVarTracker& plugin_var_tracker =
- PluginResourceTracker::GetInstance()->var_tracker();
+ *PluginGlobals::Get()->plugin_var_tracker();
// Check the plugin-side reference count.
EXPECT_EQ(1, plugin_var_tracker.GetRefCountForObject(instance_obj));
// Check the host-side var and reference count.