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

Unified Diff: ppapi/proxy/ppapi_proxy_test.cc

Issue 7629017: Add a unified resource tracker shared between the proxy and the impl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments Created 9 years, 4 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 eb7b440c273d273b7ed202542d577443c95b780f..80493307786ed30837e1da9244f9cdd9449cba76 100644
--- a/ppapi/proxy/ppapi_proxy_test.cc
+++ b/ppapi/proxy/ppapi_proxy_test.cc
@@ -147,6 +147,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_);
@@ -163,6 +164,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_);
plugin_delegate_mock_.Init(ipc_message_loop, shutdown_event);
@@ -180,6 +182,7 @@ void PluginProxyTestHarness::TearDownHarness() {
plugin_dispatcher_->DidDestroyInstance(pp_instance());
plugin_dispatcher_.reset();
+ resource_tracker_.DidDeleteInstance(pp_instance());
PluginResourceTracker::SetInstanceForTest(NULL);
}

Powered by Google App Engine
This is Rietveld 408576698