diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 22:16:26 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 22:16:26 +0000 |
| commit | faa2a45bf31af9e1131bb0cfa17ab1e2400ec0e4 (patch) | |
| tree | f3f7c49fa06c0b32a78723f77bc3581559abb0f3 /ppapi/proxy/ppapi_proxy_test.cc | |
| parent | de3c5ea947350a310bcdaabe7a8cb2dbef3fc9a8 (diff) | |
| download | chromium_src-faa2a45bf31af9e1131bb0cfa17ab1e2400ec0e4.zip chromium_src-faa2a45bf31af9e1131bb0cfa17ab1e2400ec0e4.tar.gz chromium_src-faa2a45bf31af9e1131bb0cfa17ab1e2400ec0e4.tar.bz2 | |
Revert 106142 - Add a new globals object for PPAPI tracking information.
This adds a specialization on the host and plugin side of the proxy. This
replaces the ad-hoc singleton tracking done by the resource and var trackers
with just being getters on this global object.
Most code can use the single PpapiGlobals class. I also allow code to get the
host and plugin specializations since some code needs access to some specific
features of each side.
In a later pass I'll move the other stuff out of TrackerBase and delete it.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/8316008
TBR=brettw@chromium.org
Review URL: http://codereview.chromium.org/8342016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106148 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/ppapi_proxy_test.cc')
| -rw-r--r-- | ppapi/proxy/ppapi_proxy_test.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/ppapi/proxy/ppapi_proxy_test.cc b/ppapi/proxy/ppapi_proxy_test.cc index 484253b..1c7233c 100644 --- a/ppapi/proxy/ppapi_proxy_test.cc +++ b/ppapi/proxy/ppapi_proxy_test.cc @@ -151,7 +151,9 @@ Dispatcher* PluginProxyTestHarness::GetDispatcher() { void PluginProxyTestHarness::SetUpHarness() { // These must be first since the dispatcher set-up uses them. - resource_tracker().DidCreateInstance(pp_instance()); + resource_tracker_.DidCreateInstance(pp_instance()); + PluginResourceTracker::SetInstanceForTest(&resource_tracker_); + resource_tracker_.set_var_tracker_test_override(&var_tracker_); plugin_dispatcher_.reset(new PluginDispatcher( base::Process::Current().handle(), @@ -166,7 +168,9 @@ 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()); + 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); plugin_dispatcher_.reset(new PluginDispatcher( @@ -182,7 +186,8 @@ void PluginProxyTestHarness::TearDownHarness() { plugin_dispatcher_->DidDestroyInstance(pp_instance()); plugin_dispatcher_.reset(); - resource_tracker().DidDeleteInstance(pp_instance()); + resource_tracker_.DidDeleteInstance(pp_instance()); + PluginResourceTracker::SetInstanceForTest(NULL); } base::MessageLoopProxy* |