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

Unified Diff: ppapi/proxy/ppapi_proxy_test.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/proxy/ppapi_proxy_test.cc
diff --git a/ppapi/proxy/ppapi_proxy_test.cc b/ppapi/proxy/ppapi_proxy_test.cc
index 1c7233c0fc3c53bafe047e743b3af93a05577261..484253bba258a83a29cbcde08b3a4b9f62f98672 100644
--- a/ppapi/proxy/ppapi_proxy_test.cc
+++ b/ppapi/proxy/ppapi_proxy_test.cc
@@ -151,9 +151,7 @@ Dispatcher* PluginProxyTestHarness::GetDispatcher() {
void PluginProxyTestHarness::SetUpHarness() {
// These must be first since the dispatcher set-up uses them.
- resource_tracker_.DidCreateInstance(pp_instance());
- PluginResourceTracker::SetInstanceForTest(&resource_tracker_);
- resource_tracker_.set_var_tracker_test_override(&var_tracker_);
+ resource_tracker().DidCreateInstance(pp_instance());
plugin_dispatcher_.reset(new PluginDispatcher(
base::Process::Current().handle(),
@@ -168,9 +166,7 @@ void PluginProxyTestHarness::SetUpHarnessWithChannel(
base::WaitableEvent* shutdown_event,
bool is_client) {
// These must be first since the dispatcher set-up uses them.
- resource_tracker_.DidCreateInstance(pp_instance());
- PluginResourceTracker::SetInstanceForTest(&resource_tracker_);
- resource_tracker_.set_var_tracker_test_override(&var_tracker_);
+ resource_tracker().DidCreateInstance(pp_instance());
plugin_delegate_mock_.Init(ipc_message_loop, shutdown_event);
plugin_dispatcher_.reset(new PluginDispatcher(
@@ -186,8 +182,7 @@ void PluginProxyTestHarness::TearDownHarness() {
plugin_dispatcher_->DidDestroyInstance(pp_instance());
plugin_dispatcher_.reset();
- resource_tracker_.DidDeleteInstance(pp_instance());
- PluginResourceTracker::SetInstanceForTest(NULL);
+ resource_tracker().DidDeleteInstance(pp_instance());
}
base::MessageLoopProxy*

Powered by Google App Engine
This is Rietveld 408576698