diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-03 00:00:04 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-03 00:00:04 +0000 |
commit | ca22e119daef5bc95143d2bb43f52ebaad7e4acd (patch) | |
tree | d637425808b26423f9be04926d0b2a501375e774 /ppapi/tests/test_url_loader.cc | |
parent | 99627bcf2331de091b2c71b5a84f602a7da95275 (diff) | |
download | chromium_src-ca22e119daef5bc95143d2bb43f52ebaad7e4acd.zip chromium_src-ca22e119daef5bc95143d2bb43f52ebaad7e4acd.tar.gz chromium_src-ca22e119daef5bc95143d2bb43f52ebaad7e4acd.tar.bz2 |
Remove trusted interface wrappers from the FileIO C++ wrapper. The wrapper
should not expose functions that aren't accessible to normal plugins. The
proxy can just use the trusted interface directly without having a public C++
wrapper.
TEST=it compiles
BUG=53889
Review URL: http://codereview.chromium.org/5532001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68109 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/tests/test_url_loader.cc')
-rw-r--r-- | ppapi/tests/test_url_loader.cc | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/ppapi/tests/test_url_loader.cc b/ppapi/tests/test_url_loader.cc index f21a12a3..7d4b3b2 100644 --- a/ppapi/tests/test_url_loader.cc +++ b/ppapi/tests/test_url_loader.cc @@ -8,6 +8,7 @@ #include <string> #include "ppapi/c/dev/ppb_file_io_dev.h" +#include "ppapi/c/dev/ppb_file_io_trusted_dev.h" #include "ppapi/c/dev/ppb_testing_dev.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_url_loader.h" @@ -24,7 +25,17 @@ REGISTER_TEST_CASE(URLLoader); +TestURLLoader::TestURLLoader(TestingInstance* instance) + : TestCase(instance), + file_io_trusted_interface_(NULL) { +} + bool TestURLLoader::Init() { + file_io_trusted_interface_ = static_cast<const PPB_FileIOTrusted_Dev*>( + pp::Module::Get()->GetBrowserInterface(PPB_FILEIOTRUSTED_DEV_INTERFACE)); + if (!file_io_trusted_interface_) { + instance_->AppendError("FileIOTrusted interface not available"); + } return InitTestingInterface() && EnsureRunningOverHTTP(); } @@ -226,7 +237,8 @@ std::string TestURLLoader::TestStreamToFile() { if (data != expected_body) return "ReadEntireFile returned unexpected content"; - int32_t file_descriptor = reader.GetOSFileDescriptor(); + int32_t file_descriptor = file_io_trusted_interface_->GetOSFileDescriptor( + reader.pp_resource()); if (file_descriptor < 0) return "FileIO::GetOSFileDescriptor() returned a bad file descriptor."; |