Updating the C++ PPAPI to use non-dev File interfaces.

Review URL: http://codereview.chromium.org/7345001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92290 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 91 insertions, 91 deletions

diff --git a/ppapi/cpp/url_loader.cc b/ppapi/cpp/url_loader.cc
index 0a9db41..a2cef70 100644
--- a/ppapi/cpp/url_loader.cc
+++ b/ppapi/cpp/url_loader.cc
@@ -7,7 +7,7 @@
 #include "ppapi/c/ppb_url_loader.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/cpp/completion_callback.h"
-#include "ppapi/cpp/dev/file_ref_dev.h"
+#include "ppapi/cpp/file_ref.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/module_impl.h"
diff --git a/ppapi/cpp/url_request_info.cc b/ppapi/cpp/url_request_info.cc
index 7054a909..1b31240 100644
--- a/ppapi/cpp/url_request_info.cc
+++ b/ppapi/cpp/url_request_info.cc
@@ -1,10 +1,10 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ppapi/cpp/url_request_info.h"
 
-#include "ppapi/cpp/dev/file_ref_dev.h"
+#include "ppapi/cpp/file_ref.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/module_impl.h"
@@ -45,7 +45,7 @@ bool URLRequestInfo::AppendDataToBody(const void* data, uint32_t len) {
       pp_resource(), data, len));
 }
 
-bool URLRequestInfo::AppendFileToBody(const FileRef_Dev& file_ref,
+bool URLRequestInfo::AppendFileToBody(const FileRef& file_ref,
                                       PP_Time expected_last_modified_time) {
   if (!has_interface<PPB_URLRequestInfo>())
     return false;
@@ -59,7 +59,7 @@ bool URLRequestInfo::AppendFileToBody(const FileRef_Dev& file_ref,
 }
 
 bool URLRequestInfo::AppendFileRangeToBody(
-    const FileRef_Dev& file_ref,
+    const FileRef& file_ref,
     int64_t start_offset,
     int64_t length,
     PP_Time expected_last_modified_time) {
diff --git a/ppapi/cpp/url_request_info.h b/ppapi/cpp/url_request_info.h
index f0922a5..f5856d7 100644
--- a/ppapi/cpp/url_request_info.h
+++ b/ppapi/cpp/url_request_info.h
@@ -11,7 +11,7 @@
 
 namespace pp {
 
-class FileRef_Dev;
+class FileRef;
 class Instance;
 
 class URLRequestInfo : public Resource {
@@ -25,9 +25,9 @@ class URLRequestInfo : public Resource {
   // PPB_URLRequestInfo methods:
   bool SetProperty(PP_URLRequestProperty property, const Var& value);
   bool AppendDataToBody(const void* data, uint32_t len);
-  bool AppendFileToBody(const FileRef_Dev& file_ref,
+  bool AppendFileToBody(const FileRef& file_ref,
                         PP_Time expected_last_modified_time = 0);
-  bool AppendFileRangeToBody(const FileRef_Dev& file_ref,
+  bool AppendFileRangeToBody(const FileRef& file_ref,
                              int64_t start_offset,
                              int64_t length,
                              PP_Time expected_last_modified_time = 0);
diff --git a/ppapi/cpp/url_response_info.cc b/ppapi/cpp/url_response_info.cc
index caea7ef..64b7686 100644
--- a/ppapi/cpp/url_response_info.cc
+++ b/ppapi/cpp/url_response_info.cc
@@ -1,10 +1,10 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ppapi/cpp/url_response_info.h"
 
-#include "ppapi/cpp/dev/file_ref_dev.h"
+#include "ppapi/cpp/file_ref.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/module_impl.h"
 
@@ -34,12 +34,12 @@ Var URLResponseInfo::GetProperty(PP_URLResponseProperty property) const {
                                                                property));
 }
 
-FileRef_Dev URLResponseInfo::GetBodyAsFileRef() const {
+FileRef URLResponseInfo::GetBodyAsFileRef() const {
   if (!has_interface<PPB_URLResponseInfo>())
-    return FileRef_Dev();
-  return FileRef_Dev(FileRef_Dev::PassRef(),
-                     get_interface<PPB_URLResponseInfo>()->GetBodyAsFileRef(
-                         pp_resource()));
+    return FileRef();
+  return FileRef(FileRef::PassRef(),
+                 get_interface<PPB_URLResponseInfo>()->GetBodyAsFileRef(
+                     pp_resource()));
 }
 
 }  // namespace pp
diff --git a/ppapi/cpp/url_response_info.h b/ppapi/cpp/url_response_info.h
index ac13b27..8e3824d 100644
--- a/ppapi/cpp/url_response_info.h
+++ b/ppapi/cpp/url_response_info.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -11,7 +11,7 @@
 
 namespace pp {
 
-class FileRef_Dev;
+class FileRef;
 
 class URLResponseInfo : public Resource {
  public:
@@ -27,7 +27,7 @@ class URLResponseInfo : public Resource {
 
   // PPB_URLResponseInfo methods:
   Var GetProperty(PP_URLResponseProperty property) const;
-  FileRef_Dev GetBodyAsFileRef() const;
+  FileRef GetBodyAsFileRef() const;
 
   // Convenient helpers for getting properties:
   Var GetURL() const {
diff --git a/ppapi/tests/test_file_ref.cc b/ppapi/tests/test_file_ref.cc
index 7ca032f..a753b03 100644
--- a/ppapi/tests/test_file_ref.cc
+++ b/ppapi/tests/test_file_ref.cc
@@ -7,11 +7,11 @@
 #include <stdio.h>
 
 #include "ppapi/c/pp_errors.h"
-#include "ppapi/c/dev/ppb_file_io_dev.h"
+#include "ppapi/c/ppb_file_io.h"
 #include "ppapi/c/dev/ppb_testing_dev.h"
-#include "ppapi/cpp/dev/file_io_dev.h"
-#include "ppapi/cpp/dev/file_ref_dev.h"
-#include "ppapi/cpp/dev/file_system_dev.h"
+#include "ppapi/cpp/file_io.h"
+#include "ppapi/cpp/file_ref.h"
+#include "ppapi/cpp/file_system.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/url_loader.h"
@@ -55,16 +55,16 @@ void TestFileRef::RunTest() {
 }
 
 std::string TestFileRef::TestGetFileSystemType() {
-  pp::FileSystem_Dev file_system_pers(
+  pp::FileSystem file_system_pers(
       instance_, PP_FILESYSTEMTYPE_LOCALPERSISTENT);
-  pp::FileSystem_Dev file_system_temp(
+  pp::FileSystem file_system_temp(
       instance_, PP_FILESYSTEMTYPE_LOCALTEMPORARY);
 
-  pp::FileRef_Dev file_ref_pers(file_system_pers, kPersFilePath);
+  pp::FileRef file_ref_pers(file_system_pers, kPersFilePath);
   if (file_ref_pers.GetFileSystemType() != PP_FILESYSTEMTYPE_LOCALPERSISTENT)
     return "file_ref_pers expected to be persistent.";
 
-  pp::FileRef_Dev file_ref_temp(file_system_temp, kTempFilePath);
+  pp::FileRef file_ref_temp(file_system_temp, kTempFilePath);
   if (file_ref_temp.GetFileSystemType() != PP_FILESYSTEMTYPE_LOCALTEMPORARY)
     return "file_ref_temp expected to be temporary.";
 
@@ -90,7 +90,7 @@ std::string TestFileRef::TestGetFileSystemType() {
   if (status_code != 200)
     return "Unexpected HTTP status code";
 
-  pp::FileRef_Dev file_ref_ext(response_info.GetBodyAsFileRef());
+  pp::FileRef file_ref_ext(response_info.GetBodyAsFileRef());
   if (file_ref_ext.GetFileSystemType() != PP_FILESYSTEMTYPE_EXTERNAL)
     return "file_ref_ext expected to be external.";
 
@@ -98,23 +98,23 @@ std::string TestFileRef::TestGetFileSystemType() {
 }
 
 std::string TestFileRef::TestGetName() {
-  pp::FileSystem_Dev file_system_pers(
+  pp::FileSystem file_system_pers(
       instance_, PP_FILESYSTEMTYPE_LOCALPERSISTENT);
-  pp::FileSystem_Dev file_system_temp(
+  pp::FileSystem file_system_temp(
       instance_, PP_FILESYSTEMTYPE_LOCALTEMPORARY);
 
-  pp::FileRef_Dev file_ref_pers(file_system_pers, kPersFilePath);
+  pp::FileRef file_ref_pers(file_system_pers, kPersFilePath);
   std::string name = file_ref_pers.GetName().AsString();
   if (name != kPersFileName)
     return ReportMismatch("FileRef::GetName", name, kPersFileName);
 
-  pp::FileRef_Dev file_ref_temp(file_system_temp, kTempFilePath);
+  pp::FileRef file_ref_temp(file_system_temp, kTempFilePath);
   name = file_ref_temp.GetName().AsString();
   if (name != kTempFileName)
     return ReportMismatch("FileRef::GetName", name, kTempFileName);
 
   // Test the "/" case.
-  pp::FileRef_Dev file_ref_slash(file_system_temp, "/");
+  pp::FileRef file_ref_slash(file_system_temp, "/");
   name = file_ref_slash.GetName().AsString();
   if (name != "/")
     return ReportMismatch("FileRef::GetName", name, "/");
@@ -141,7 +141,7 @@ std::string TestFileRef::TestGetName() {
   if (status_code != 200)
     return "Unexpected HTTP status code";
 
-  pp::FileRef_Dev file_ref_ext(response_info.GetBodyAsFileRef());
+  pp::FileRef file_ref_ext(response_info.GetBodyAsFileRef());
   name = file_ref_ext.GetName().AsString();
   if (name == "")
     return ReportMismatch("FileRef::GetName", name, "<a temp file>");
@@ -150,17 +150,17 @@ std::string TestFileRef::TestGetName() {
 }
 
 std::string TestFileRef::TestGetPath() {
-  pp::FileSystem_Dev file_system_pers(
+  pp::FileSystem file_system_pers(
       instance_, PP_FILESYSTEMTYPE_LOCALPERSISTENT);
-  pp::FileSystem_Dev file_system_temp(
+  pp::FileSystem file_system_temp(
       instance_, PP_FILESYSTEMTYPE_LOCALTEMPORARY);
 
-  pp::FileRef_Dev file_ref_pers(file_system_pers, kPersFilePath);
+  pp::FileRef file_ref_pers(file_system_pers, kPersFilePath);
   std::string path = file_ref_pers.GetPath().AsString();
   if (path != kPersFilePath)
     return ReportMismatch("FileRef::GetPath", path, kPersFilePath);
 
-  pp::FileRef_Dev file_ref_temp(file_system_temp, kTempFilePath);
+  pp::FileRef file_ref_temp(file_system_temp, kTempFilePath);
   path = file_ref_temp.GetPath().AsString();
   if (path != kTempFilePath)
     return ReportMismatch("FileRef::GetPath", path, kTempFilePath);
@@ -187,7 +187,7 @@ std::string TestFileRef::TestGetPath() {
   if (status_code != 200)
     return "Unexpected HTTP status code";
 
-  pp::FileRef_Dev file_ref_ext(response_info.GetBodyAsFileRef());
+  pp::FileRef file_ref_ext(response_info.GetBodyAsFileRef());
   if (!file_ref_ext.GetPath().is_undefined())
     return "The path of an external FileRef should be void.";
 
@@ -195,29 +195,29 @@ std::string TestFileRef::TestGetPath() {
 }
 
 std::string TestFileRef::TestGetParent() {
-  pp::FileSystem_Dev file_system_pers(
+  pp::FileSystem file_system_pers(
       instance_, PP_FILESYSTEMTYPE_LOCALPERSISTENT);
-  pp::FileSystem_Dev file_system_temp(
+  pp::FileSystem file_system_temp(
       instance_, PP_FILESYSTEMTYPE_LOCALTEMPORARY);
 
-  pp::FileRef_Dev file_ref_pers(file_system_pers, kPersFilePath);
+  pp::FileRef file_ref_pers(file_system_pers, kPersFilePath);
   std::string parent_path = file_ref_pers.GetParent().GetPath().AsString();
   if (parent_path != kParentPath)
     return ReportMismatch("FileRef::GetParent", parent_path, kParentPath);
 
-  pp::FileRef_Dev file_ref_temp(file_system_temp, kTempFilePath);
+  pp::FileRef file_ref_temp(file_system_temp, kTempFilePath);
   parent_path = file_ref_temp.GetParent().GetPath().AsString();
   if (parent_path != kParentPath)
     return ReportMismatch("FileRef::GetParent", parent_path, kParentPath);
 
   // Test the "/" case.
-  pp::FileRef_Dev file_ref_slash(file_system_temp, "/");
+  pp::FileRef file_ref_slash(file_system_temp, "/");
   parent_path = file_ref_slash.GetParent().GetPath().AsString();
   if (parent_path != "/")
     return ReportMismatch("FileRef::GetParent", parent_path, "/");
 
   // Test the "/foo" case (the parent is "/").
-  pp::FileRef_Dev file_ref_with_root_parent(file_system_temp, "/foo");
+  pp::FileRef file_ref_with_root_parent(file_system_temp, "/foo");
   parent_path = file_ref_with_root_parent.GetParent().GetPath().AsString();
   if (parent_path != "/")
     return ReportMismatch("FileRef::GetParent", parent_path, "/");
@@ -244,7 +244,7 @@ std::string TestFileRef::TestGetParent() {
   if (status_code != 200)
     return "Unexpected HTTP status code";
 
-  pp::FileRef_Dev file_ref_ext(response_info.GetBodyAsFileRef());
+  pp::FileRef file_ref_ext(response_info.GetBodyAsFileRef());
   if (!file_ref_ext.GetParent().is_null())
     return "The parent of an external FileRef should be null.";
 
@@ -255,7 +255,7 @@ std::string TestFileRef::TestMakeDirectory() {
   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 (force_async_ && rv != PP_OK_COMPLETIONPENDING)
     return ReportError("FileSystem::Open force_async", rv);
@@ -265,7 +265,7 @@ std::string TestFileRef::TestMakeDirectory() {
     return ReportError("FileSystem::Open", rv);
 
   // MakeDirectory.
-  pp::FileRef_Dev dir_ref(file_system, "/test_dir_make_directory");
+  pp::FileRef dir_ref(file_system, "/test_dir_make_directory");
   rv = dir_ref.MakeDirectory(callback);
   if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
     return ReportError("FileSystem::MakeDirectory force_async", rv);
@@ -276,7 +276,7 @@ std::string TestFileRef::TestMakeDirectory() {
 
   // MakeDirectory aborted.
   callback.reset_run_count();
-  rv = pp::FileRef_Dev(file_system, "/test_dir_make_abort")
+  rv = pp::FileRef(file_system, "/test_dir_make_abort")
       .MakeDirectory(callback);
   if (callback.run_count() > 0)
     return "FileSystem::MakeDirectory ran callback synchronously.";
@@ -291,7 +291,7 @@ std::string TestFileRef::TestMakeDirectory() {
   }
 
   // MakeDirectoryIncludingAncestors.
-  dir_ref = pp::FileRef_Dev(file_system, "/dir_make_dir_1/dir_make_dir_2");
+  dir_ref = pp::FileRef(file_system, "/dir_make_dir_1/dir_make_dir_2");
   rv = dir_ref.MakeDirectoryIncludingAncestors(callback);
   if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
     return ReportError("FileSystem::MakeDirectory force_async", rv);
@@ -302,7 +302,7 @@ std::string TestFileRef::TestMakeDirectory() {
 
   // MakeDirectoryIncludingAncestors aborted.
   callback.reset_run_count();
-  rv = pp::FileRef_Dev(file_system, "/dir_make_abort_1/dir_make_abort_2")
+  rv = pp::FileRef(file_system, "/dir_make_abort_1/dir_make_abort_2")
       .MakeDirectoryIncludingAncestors(callback);
   if (callback.run_count() > 0) {
     return "FileSystem::MakeDirectoryIncludingAncestors "
@@ -320,7 +320,7 @@ std::string TestFileRef::TestMakeDirectory() {
   }
 
   // MakeDirectory with nested path.
-  dir_ref = pp::FileRef_Dev(file_system, "/dir_make_dir_3/dir_make_dir_4");
+  dir_ref = pp::FileRef(file_system, "/dir_make_dir_3/dir_make_dir_4");
   rv = dir_ref.MakeDirectory(callback);
   if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
     return ReportError("FileSystem::MakeDirectory force_async", rv);
@@ -336,7 +336,7 @@ std::string TestFileRef::TestMakeDirectory() {
 
 std::string TestFileRef::TestQueryAndTouchFile() {
   TestCompletionCallback callback(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 = file_system.Open(1024, callback);
   if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
     return ReportError("FileSystem::Open force_async", rv);
@@ -345,8 +345,8 @@ std::string TestFileRef::TestQueryAndTouchFile() {
   if (rv != PP_OK)
     return ReportError("FileSystem::Open", rv);
 
-  pp::FileRef_Dev file_ref(file_system, "/file_touch");
-  pp::FileIO_Dev file_io(instance_);
+  pp::FileRef file_ref(file_system, "/file_touch");
+  pp::FileIO file_io(instance_);
   rv = file_io.Open(file_ref,
                     PP_FILEOPENFLAG_CREATE |
                     PP_FILEOPENFLAG_TRUNCATE |
@@ -383,7 +383,7 @@ std::string TestFileRef::TestQueryAndTouchFile() {
 
   // Touch aborted.
   callback.reset_run_count();
-  rv = pp::FileRef_Dev(file_system, "/file_touch_abort")
+  rv = pp::FileRef(file_system, "/file_touch_abort")
       .Touch(last_access_time, last_modified_time, callback);
   if (callback.run_count() > 0)
     return "FileSystem::Touch ran callback synchronously.";
@@ -398,7 +398,7 @@ std::string TestFileRef::TestQueryAndTouchFile() {
   }
 
   // Query.
-  PP_FileInfo_Dev info;
+  PP_FileInfo info;
   rv = file_io.Query(&info, callback);
   if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
     return ReportError("FileSystem::Query force_async", rv);
@@ -418,7 +418,7 @@ std::string TestFileRef::TestQueryAndTouchFile() {
   // TODO(viettrungluu): this test causes a bunch of LOG(WARNING)s; investigate.
   callback.reset_run_count();
   // TODO(viettrungluu): check |info| for late writes.
-  rv = pp::FileRef_Dev(file_system, "/file_touch").Touch(
+  rv = pp::FileRef(file_system, "/file_touch").Touch(
       last_access_time, last_modified_time, callback);
   if (callback.run_count() > 0)
     return "FileSystem::Touch ran callback synchronously.";
@@ -437,7 +437,7 @@ std::string TestFileRef::TestQueryAndTouchFile() {
 
 std::string TestFileRef::TestDeleteFileAndDirectory() {
   TestCompletionCallback callback(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 = file_system.Open(1024, callback);
   if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
     return ReportError("FileSystem::Open force_async", rv);
@@ -446,8 +446,8 @@ std::string TestFileRef::TestDeleteFileAndDirectory() {
   if (rv != PP_OK)
     return ReportError("FileSystem::Open", rv);
 
-  pp::FileRef_Dev file_ref(file_system, "/file_delete");
-  pp::FileIO_Dev file_io(instance_);
+  pp::FileRef file_ref(file_system, "/file_delete");
+  pp::FileIO file_io(instance_);
   rv = file_io.Open(file_ref, PP_FILEOPENFLAG_CREATE, callback);
   if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
     return ReportError("FileIO::Open force_async", rv);
@@ -464,7 +464,7 @@ std::string TestFileRef::TestDeleteFileAndDirectory() {
   if (rv != PP_OK)
     return ReportError("FileRef::Delete", rv);
 
-  pp::FileRef_Dev dir_ref(file_system, "/dir_delete");
+  pp::FileRef dir_ref(file_system, "/dir_delete");
   rv = dir_ref.MakeDirectory(callback);
   if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
     return ReportError("FileRef::MakeDirectory force_async", rv);
@@ -481,7 +481,7 @@ std::string TestFileRef::TestDeleteFileAndDirectory() {
   if (rv != PP_OK)
     return ReportError("FileRef::Delete", rv);
 
-  pp::FileRef_Dev nested_dir_ref(file_system, "/dir_delete_1/dir_delete_2");
+  pp::FileRef nested_dir_ref(file_system, "/dir_delete_1/dir_delete_2");
   rv = nested_dir_ref.MakeDirectoryIncludingAncestors(callback);
   if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
     return ReportError("FileRef::Open force_async", rv);
@@ -491,7 +491,7 @@ std::string TestFileRef::TestDeleteFileAndDirectory() {
     return ReportError("FileRef::MakeDirectoryIncludingAncestors", rv);
 
   // Hang on to a ref to the parent; otherwise the callback will be aborted.
-  pp::FileRef_Dev parent_dir_ref = nested_dir_ref.GetParent();
+  pp::FileRef parent_dir_ref = nested_dir_ref.GetParent();
   rv = parent_dir_ref.Delete(callback);
   if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
     return ReportError("FileRef::Open force_async", rv);
@@ -500,7 +500,7 @@ std::string TestFileRef::TestDeleteFileAndDirectory() {
   if (rv != PP_ERROR_FAILED)
     return ReportError("FileRef::Delete", rv);
 
-  pp::FileRef_Dev nonexistent_file_ref(file_system, "/nonexistent_file_delete");
+  pp::FileRef nonexistent_file_ref(file_system, "/nonexistent_file_delete");
   rv = nonexistent_file_ref.Delete(callback);
   if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
     return ReportError("FileRef::Open force_async", rv);
@@ -511,8 +511,8 @@ std::string TestFileRef::TestDeleteFileAndDirectory() {
 
   // Delete aborted.
   {
-    pp::FileRef_Dev file_ref_abort(file_system, "/file_delete_abort");
-    pp::FileIO_Dev file_io_abort(instance_);
+    pp::FileRef file_ref_abort(file_system, "/file_delete_abort");
+    pp::FileIO file_io_abort(instance_);
     rv = file_io_abort.Open(file_ref_abort, PP_FILEOPENFLAG_CREATE, callback);
     if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
       return ReportError("FileIO::Open force_async", rv);
@@ -541,7 +541,7 @@ std::string TestFileRef::TestDeleteFileAndDirectory() {
 
 std::string TestFileRef::TestRenameFileAndDirectory() {
   TestCompletionCallback callback(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 = file_system.Open(1024, callback);
   if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
     return ReportError("FileSystem::Open force_async", rv);
@@ -550,8 +550,8 @@ std::string TestFileRef::TestRenameFileAndDirectory() {
   if (rv != PP_OK)
     return ReportError("FileSystem::Open", rv);
 
-  pp::FileRef_Dev file_ref(file_system, "/file_rename");
-  pp::FileIO_Dev file_io(instance_);
+  pp::FileRef file_ref(file_system, "/file_rename");
+  pp::FileIO file_io(instance_);
   rv = file_io.Open(file_ref, PP_FILEOPENFLAG_CREATE, callback);
   if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
     return ReportError("FileIO::Open force_async", rv);
@@ -560,7 +560,7 @@ std::string TestFileRef::TestRenameFileAndDirectory() {
   if (rv != PP_OK)
     return ReportError("FileIO::Open", rv);
 
-  pp::FileRef_Dev target_file_ref(file_system, "/target_file_rename");
+  pp::FileRef target_file_ref(file_system, "/target_file_rename");
   rv = file_ref.Rename(target_file_ref, callback);
   if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
     return ReportError("FileRef::Rename force_async", rv);
@@ -569,7 +569,7 @@ std::string TestFileRef::TestRenameFileAndDirectory() {
   if (rv != PP_OK)
     return ReportError("FileRef::Rename", rv);
 
-  pp::FileRef_Dev dir_ref(file_system, "/dir_rename");
+  pp::FileRef dir_ref(file_system, "/dir_rename");
   rv = dir_ref.MakeDirectory(callback);
   if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
     return ReportError("FileRef::MakeDirectory force_async", rv);
@@ -578,7 +578,7 @@ std::string TestFileRef::TestRenameFileAndDirectory() {
   if (rv != PP_OK)
     return ReportError("FileRef::MakeDirectory", rv);
 
-  pp::FileRef_Dev target_dir_ref(file_system, "/target_dir_rename");
+  pp::FileRef target_dir_ref(file_system, "/target_dir_rename");
   rv = dir_ref.Rename(target_dir_ref, callback);
   if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
     return ReportError("FileRef::Rename force_async", rv);
@@ -587,7 +587,7 @@ std::string TestFileRef::TestRenameFileAndDirectory() {
   if (rv != PP_OK)
     return ReportError("FileRef::Rename", rv);
 
-  pp::FileRef_Dev nested_dir_ref(file_system, "/dir_rename_1/dir_rename_2");
+  pp::FileRef nested_dir_ref(file_system, "/dir_rename_1/dir_rename_2");
   rv = nested_dir_ref.MakeDirectoryIncludingAncestors(callback);
   if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
     return ReportError("FileRef::MakeDirectory force_async", rv);
@@ -596,7 +596,7 @@ std::string TestFileRef::TestRenameFileAndDirectory() {
   if (rv != PP_OK)
     return ReportError("FileRef::MakeDirectoryIncludingAncestors", rv);
 
-  pp::FileRef_Dev target_nested_dir_ref(file_system, "/dir_rename_1");
+  pp::FileRef target_nested_dir_ref(file_system, "/dir_rename_1");
   rv = nested_dir_ref.Rename(target_nested_dir_ref, callback);
   if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
     return ReportError("FileRef::Open force_async", rv);
@@ -608,11 +608,11 @@ std::string TestFileRef::TestRenameFileAndDirectory() {
   // Rename aborted.
   // TODO(viettrungluu): Figure out what we want to do if the target file
   // resource is destroyed before completion.
-  pp::FileRef_Dev target_file_ref_abort(file_system,
+  pp::FileRef target_file_ref_abort(file_system,
                                         "/target_file_rename_abort");
   {
-    pp::FileRef_Dev file_ref_abort(file_system, "/file_rename_abort");
-    pp::FileIO_Dev file_io_abort(instance_);
+    pp::FileRef file_ref_abort(file_system, "/file_rename_abort");
+    pp::FileIO file_io_abort(instance_);
     rv = file_io_abort.Open(file_ref_abort, PP_FILEOPENFLAG_CREATE, callback);
     if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
       return ReportError("FileIO::Open force_async", rv);
diff --git a/ppapi/tests/test_url_loader.cc b/ppapi/tests/test_url_loader.cc
index fe1bec1..e95d123 100644
--- a/ppapi/tests/test_url_loader.cc
+++ b/ppapi/tests/test_url_loader.cc
@@ -8,16 +8,16 @@
 #include <string.h>
 #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/dev/ppb_url_util_dev.h"
 #include "ppapi/c/pp_errors.h"
+#include "ppapi/c/ppb_file_io.h"
 #include "ppapi/c/ppb_url_loader.h"
-#include "ppapi/cpp/dev/file_io_dev.h"
-#include "ppapi/cpp/dev/file_ref_dev.h"
-#include "ppapi/cpp/dev/file_system_dev.h"
+#include "ppapi/c/trusted/ppb_file_io_trusted.h"
 #include "ppapi/cpp/dev/url_util_dev.h"
+#include "ppapi/cpp/file_io.h"
+#include "ppapi/cpp/file_ref.h"
+#include "ppapi/cpp/file_system.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/url_loader.h"
@@ -34,8 +34,8 @@ TestURLLoader::TestURLLoader(TestingInstance* instance)
 }
 
 bool TestURLLoader::Init() {
-  file_io_trusted_interface_ = static_cast<const PPB_FileIOTrusted_Dev*>(
-      pp::Module::Get()->GetBrowserInterface(PPB_FILEIOTRUSTED_DEV_INTERFACE));
+  file_io_trusted_interface_ = static_cast<const PPB_FileIOTrusted*>(
+      pp::Module::Get()->GetBrowserInterface(PPB_FILEIOTRUSTED_INTERFACE));
   if (!file_io_trusted_interface_) {
     instance_->AppendError("FileIOTrusted interface not available");
   }
@@ -57,7 +57,7 @@ void TestURLLoader::RunTest() {
   RUN_TEST_FORCEASYNC_AND_NOT(AbortCalls);
 }
 
-std::string TestURLLoader::ReadEntireFile(pp::FileIO_Dev* file_io,
+std::string TestURLLoader::ReadEntireFile(pp::FileIO* file_io,
                                           std::string* data) {
   TestCompletionCallback callback(instance_->pp_instance(), force_async_);
   char buf[256];
@@ -221,7 +221,7 @@ std::string TestURLLoader::TestStreamToFile() {
   if (status_code != 200)
     return "Unexpected HTTP status code";
 
-  pp::FileRef_Dev body(response_info.GetBodyAsFileRef());
+  pp::FileRef body(response_info.GetBodyAsFileRef());
   if (body.is_null())
     return "URLResponseInfo::GetBody returned null";
 
@@ -233,7 +233,7 @@ std::string TestURLLoader::TestStreamToFile() {
   if (rv != PP_OK)
     return ReportError("URLLoader::FinishStreamingToFile", rv);
 
-  pp::FileIO_Dev reader(instance_);
+  pp::FileIO reader(instance_);
   rv = reader.Open(body, PP_FILEOPENFLAG_READ, callback);
   if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
     return ReportError("FileIO::Open force_async", rv);
diff --git a/ppapi/tests/test_url_loader.h b/ppapi/tests/test_url_loader.h
index b91ad75..aaee2b7 100644
--- a/ppapi/tests/test_url_loader.h
+++ b/ppapi/tests/test_url_loader.h
@@ -9,10 +9,10 @@
 
 #include "ppapi/tests/test_case.h"
 
-struct PPB_FileIOTrusted_Dev;
+struct PPB_FileIOTrusted;
 
 namespace pp {
-class FileIO_Dev;
+class FileIO;
 class URLLoader;
 class URLRequestInfo;
 }
@@ -26,7 +26,7 @@ class TestURLLoader : public TestCase {
   virtual void RunTest();
 
  private:
-  std::string ReadEntireFile(pp::FileIO_Dev* file_io, std::string* data);
+  std::string ReadEntireFile(pp::FileIO* file_io, std::string* data);
   std::string ReadEntireResponseBody(pp::URLLoader* loader,
                                      std::string* body);
   std::string LoadAndCompareBody(const pp::URLRequestInfo& request,
@@ -45,7 +45,7 @@ class TestURLLoader : public TestCase {
   std::string TestAuditURLRedirect();
   std::string TestAbortCalls();
 
-  const PPB_FileIOTrusted_Dev* file_io_trusted_interface_;
+  const PPB_FileIOTrusted* file_io_trusted_interface_;
 };
 
 #endif  // PAPPI_TESTS_TEST_URL_LOADER_H_