diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-02 18:12:41 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-02 18:12:41 +0000 |
| commit | 195d4cde0da1d590ea978da9e532feceebe12ec1 (patch) | |
| tree | f93460315e38383d74dcb46590275ef989b40caa /ppapi/proxy/ppapi_proxy_test.cc | |
| parent | 8a56410423d622cf586c7587f6c3634d391254d7 (diff) | |
| download | chromium_src-195d4cde0da1d590ea978da9e532feceebe12ec1.zip chromium_src-195d4cde0da1d590ea978da9e532feceebe12ec1.tar.gz chromium_src-195d4cde0da1d590ea978da9e532feceebe12ec1.tar.bz2 | |
Hook up PpapiPermissions in more places.
This doesn't actually do much more checking of the permissions, but it should wire it up everywhere we'll need it. It will also at least only return public interfaces via GetInterface in the proxy now unless other bits are supplied.
Review URL: https://codereview.chromium.org/10984094
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159729 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/ppapi_proxy_test.cc')
| -rw-r--r-- | ppapi/proxy/ppapi_proxy_test.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ppapi/proxy/ppapi_proxy_test.cc b/ppapi/proxy/ppapi_proxy_test.cc index be75083..bf139bb 100644 --- a/ppapi/proxy/ppapi_proxy_test.cc +++ b/ppapi/proxy/ppapi_proxy_test.cc @@ -169,6 +169,7 @@ void PluginProxyTestHarness::SetUpHarness() { plugin_dispatcher_.reset(new PluginDispatcher( &MockGetInterface, + PpapiPermissions(), false)); plugin_dispatcher_->InitWithTestSink(&sink()); plugin_dispatcher_->DidCreateInstance(pp_instance()); @@ -195,6 +196,7 @@ void PluginProxyTestHarness::SetUpHarnessWithChannel( plugin_dispatcher_.reset(new PluginDispatcher( &MockGetInterface, + PpapiPermissions(), false)); plugin_dispatcher_->InitPluginWithChannel(&plugin_delegate_mock_, channel_handle, @@ -314,7 +316,8 @@ void HostProxyTestHarness::SetUpHarness() { host_dispatcher_.reset(new HostDispatcher( pp_module(), &MockGetInterface, - status_receiver_.release())); + status_receiver_.release(), + PpapiPermissions())); host_dispatcher_->InitWithTestSink(&sink()); HostDispatcher::SetForInstance(pp_instance(), host_dispatcher_.get()); } @@ -333,7 +336,8 @@ void HostProxyTestHarness::SetUpHarnessWithChannel( host_dispatcher_.reset(new HostDispatcher( pp_module(), &MockGetInterface, - status_receiver_.release())); + status_receiver_.release(), + PpapiPermissions())); ppapi::Preferences preferences; host_dispatcher_->InitHostWithChannel(&delegate_mock_, channel_handle, is_client, preferences); |