diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 21:57:50 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 21:57:50 +0000 |
| commit | 77ac44f19b5d1ead7c1b29900341fbfc07286ce6 (patch) | |
| tree | a09b9951a19ca4a322fbd37a82438ed5e38ae44d /ppapi/proxy/ppapi_proxy_test.cc | |
| parent | 6b292e3db6ccdda0477289b3d8c713f2707ae9ff (diff) | |
| download | chromium_src-77ac44f19b5d1ead7c1b29900341fbfc07286ce6.zip chromium_src-77ac44f19b5d1ead7c1b29900341fbfc07286ce6.tar.gz chromium_src-77ac44f19b5d1ead7c1b29900341fbfc07286ce6.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106142 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, 3 insertions, 8 deletions
diff --git a/ppapi/proxy/ppapi_proxy_test.cc b/ppapi/proxy/ppapi_proxy_test.cc index 1c7233c..484253b 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* |