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

Unified Diff: ppapi/shared_impl/resource_tracker_unittest.cc

Issue 8316008: 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
Index: ppapi/shared_impl/resource_tracker_unittest.cc
diff --git a/ppapi/shared_impl/resource_tracker_unittest.cc b/ppapi/shared_impl/resource_tracker_unittest.cc
index 371f6e771df6136405984ab6be705895e729eda7..2e22d6a1bcee4a9a0c04c213f01c88eabfaae439 100644
--- a/ppapi/shared_impl/resource_tracker_unittest.cc
+++ b/ppapi/shared_impl/resource_tracker_unittest.cc
@@ -7,6 +7,7 @@
#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 {
@@ -68,20 +69,14 @@ class ResourceTrackerTest : public testing::Test, public TrackerBase {
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 resource_tracker_; }
+ ResourceTracker& resource_tracker() { return *globals_.GetResourceTracker(); }
private:
- ResourceTracker resource_tracker_;
+ TestGlobals globals_;
};
// Test that LastPluginRefWasDeleted is called when the last plugin ref was

Powered by Google App Engine
This is Rietveld 408576698