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

Unified Diff: ppapi/shared_impl/resource_tracker_unittest.cc

Issue 8342016: Revert 106142 - Add a new globals object for PPAPI tracking information. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 2 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
« no previous file with comments | « ppapi/shared_impl/resource.cc ('k') | ppapi/shared_impl/scoped_pp_resource.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/shared_impl/resource_tracker_unittest.cc
===================================================================
--- ppapi/shared_impl/resource_tracker_unittest.cc (revision 106146)
+++ ppapi/shared_impl/resource_tracker_unittest.cc (working copy)
@@ -7,7 +7,6 @@
#include "base/compiler_specific.h"
#include "ppapi/shared_impl/resource.h"
#include "ppapi/shared_impl/resource_tracker.h"
-#include "ppapi/shared_impl/test_globals.h"
#include "ppapi/shared_impl/tracker_base.h"
namespace ppapi {
@@ -69,14 +68,20 @@
ppapi::proxy::InterfaceID id) OVERRIDE {
return NULL;
}
+ virtual VarTracker* GetVarTracker() OVERRIDE {
+ return NULL;
+ }
+ virtual ResourceTracker* GetResourceTracker() OVERRIDE {
+ return &resource_tracker_;
+ }
virtual PP_Module GetModuleForInstance(PP_Instance /* instance */) OVERRIDE {
return 0;
}
- ResourceTracker& resource_tracker() { return *globals_.GetResourceTracker(); }
+ ResourceTracker& resource_tracker() { return resource_tracker_; }
private:
- TestGlobals globals_;
+ ResourceTracker resource_tracker_;
};
// Test that LastPluginRefWasDeleted is called when the last plugin ref was
« no previous file with comments | « ppapi/shared_impl/resource.cc ('k') | ppapi/shared_impl/scoped_pp_resource.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698