summaryrefslogtreecommitdiffstats
path: root/ppapi/tests/test_file_system.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-15 19:07:39 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-15 19:07:39 +0000
commitcc0eb0e6ac56e505d07c29dc54df7e668d768a32 (patch)
tree773d00ba8a005425e251615dd2dbb6589ed23432 /ppapi/tests/test_file_system.cc
parenta8e80d8bdbf48a742810e184db6826cd473183d7 (diff)
downloadchromium_src-cc0eb0e6ac56e505d07c29dc54df7e668d768a32.zip
chromium_src-cc0eb0e6ac56e505d07c29dc54df7e668d768a32.tar.gz
chromium_src-cc0eb0e6ac56e505d07c29dc54df7e668d768a32.tar.bz2
Clean up the file dev interfaces. The combination of some dev and some non
dev interfaces in various places makes it impossible to compile some code. This makes the dev versions typedefs which should avoid breaking most (though not all) users. It also converts the file chooser to using the non-dev version of file ref. TEST=it compiles Review URL: http://codereview.chromium.org/7387011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92725 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/tests/test_file_system.cc')
-rw-r--r--ppapi/tests/test_file_system.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/ppapi/tests/test_file_system.cc b/ppapi/tests/test_file_system.cc
index fe5c902..9232385 100644
--- a/ppapi/tests/test_file_system.cc
+++ b/ppapi/tests/test_file_system.cc
@@ -7,7 +7,7 @@
#include <string.h>
#include "ppapi/c/pp_errors.h"
-#include "ppapi/cpp/dev/file_system_dev.h"
+#include "ppapi/cpp/file_system.h"
#include "ppapi/tests/test_utils.h"
#include "ppapi/tests/testing_instance.h"
@@ -26,7 +26,7 @@ std::string TestFileSystem::TestOpen() {
TestCompletionCallback callback(instance_->pp_instance(), force_async_);
// Open.
- pp::FileSystem_Dev file_system(instance_, PP_FILESYSTEMTYPE_LOCALTEMPORARY);
+ pp::FileSystem file_system(instance_, PP_FILESYSTEMTYPE_LOCALTEMPORARY);
int32_t rv = file_system.Open(1024, callback);
if (rv == PP_OK_COMPLETIONPENDING)
rv = callback.WaitForResult();
@@ -35,7 +35,7 @@ std::string TestFileSystem::TestOpen() {
// Open aborted (see the DirectoryReader test for comments).
callback.reset_run_count();
- rv = pp::FileSystem_Dev(instance_, PP_FILESYSTEMTYPE_LOCALTEMPORARY)
+ rv = pp::FileSystem(instance_, PP_FILESYSTEMTYPE_LOCALTEMPORARY)
.Open(1024, callback);
if (callback.run_count() > 0)
return "FileSystem::Open ran callback synchronously.";
@@ -56,7 +56,7 @@ std::string TestFileSystem::TestMultipleOpens() {
// Should not allow multiple opens, no matter the first open has completed or
// not.
TestCompletionCallback callback_1(instance_->pp_instance(), force_async_);
- pp::FileSystem_Dev file_system(instance_, PP_FILESYSTEMTYPE_LOCALTEMPORARY);
+ pp::FileSystem file_system(instance_, PP_FILESYSTEMTYPE_LOCALTEMPORARY);
int32_t rv_1 = file_system.Open(1024, callback_1);
if (callback_1.run_count() > 0)
return "FileSystem::Open1 ran callback synchronously.";