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

Unified Diff: ppapi/proxy/ppapi_proxy_test.h

Issue 8344025: Add a new globals object for PPAPI tracking information. (Closed) Base URL: svn://chrome-svn/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/proxy/plugin_var_serialization_rules.cc ('k') | ppapi/proxy/ppapi_proxy_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/proxy/ppapi_proxy_test.h
===================================================================
--- ppapi/proxy/ppapi_proxy_test.h (revision 106515)
+++ ppapi/proxy/ppapi_proxy_test.h (working copy)
@@ -13,6 +13,7 @@
#include "ppapi/c/pp_instance.h"
#include "ppapi/proxy/host_dispatcher.h"
#include "ppapi/proxy/plugin_dispatcher.h"
+#include "ppapi/proxy/plugin_globals.h"
#include "ppapi/proxy/plugin_resource_tracker.h"
#include "ppapi/proxy/plugin_var_tracker.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -78,8 +79,12 @@
virtual ~PluginProxyTestHarness();
PluginDispatcher* plugin_dispatcher() { return plugin_dispatcher_.get(); }
- PluginResourceTracker& resource_tracker() { return resource_tracker_; }
- PluginVarTracker& var_tracker() { return var_tracker_; }
+ PluginResourceTracker& resource_tracker() {
+ return *plugin_globals_.plugin_resource_tracker();
+ }
+ PluginVarTracker& var_tracker() {
+ return *plugin_globals_.plugin_var_tracker();
+ }
// ProxyTestHarnessBase implementation.
virtual Dispatcher* GetDispatcher();
@@ -123,8 +128,8 @@
};
private:
- PluginResourceTracker resource_tracker_;
- PluginVarTracker var_tracker_;
+ PluginGlobals plugin_globals_;
+
scoped_ptr<PluginDispatcher> plugin_dispatcher_;
PluginDelegateMock plugin_delegate_mock_;
};
« no previous file with comments | « ppapi/proxy/plugin_var_serialization_rules.cc ('k') | ppapi/proxy/ppapi_proxy_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698