Check explicitly for version 1.0 PPB_File* interfaces in pp::File* wrappers.

BUG=107398


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

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

3 files changed, 53 insertions, 51 deletions

diff --git a/ppapi/cpp/file_io.cc b/ppapi/cpp/file_io.cc
index 399c430..e596577 100644
--- a/ppapi/cpp/file_io.cc
+++ b/ppapi/cpp/file_io.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -16,8 +16,8 @@ namespace pp {
 
 namespace {
 
-template <> const char* interface_name<PPB_FileIO>() {
-  return PPB_FILEIO_INTERFACE;
+template <> const char* interface_name<PPB_FileIO_1_0>() {
+  return PPB_FILEIO_INTERFACE_1_0;
 }
 
 }  // namespace
@@ -26,9 +26,9 @@ FileIO::FileIO() {
 }
 
 FileIO::FileIO(const InstanceHandle& instance) {
-  if (!has_interface<PPB_FileIO>())
+  if (!has_interface<PPB_FileIO_1_0>())
     return;
-  PassRefFromConstructor(get_interface<PPB_FileIO>()->Create(
+  PassRefFromConstructor(get_interface<PPB_FileIO_1_0>()->Create(
       instance.pp_instance()));
 }
 
@@ -39,27 +39,27 @@ FileIO::FileIO(const FileIO& other)
 int32_t FileIO::Open(const FileRef& file_ref,
                      int32_t open_flags,
                      const CompletionCallback& cc) {
-  if (!has_interface<PPB_FileIO>())
+  if (!has_interface<PPB_FileIO_1_0>())
     return cc.MayForce(PP_ERROR_NOINTERFACE);
-  return get_interface<PPB_FileIO>()->Open(
+  return get_interface<PPB_FileIO_1_0>()->Open(
       pp_resource(), file_ref.pp_resource(), open_flags,
       cc.pp_completion_callback());
 }
 
 int32_t FileIO::Query(PP_FileInfo* result_buf,
                       const CompletionCallback& cc) {
-  if (!has_interface<PPB_FileIO>())
+  if (!has_interface<PPB_FileIO_1_0>())
     return cc.MayForce(PP_ERROR_NOINTERFACE);
-  return get_interface<PPB_FileIO>()->Query(
+  return get_interface<PPB_FileIO_1_0>()->Query(
       pp_resource(), result_buf, cc.pp_completion_callback());
 }
 
 int32_t FileIO::Touch(PP_Time last_access_time,
                       PP_Time last_modified_time,
                       const CompletionCallback& cc) {
-  if (!has_interface<PPB_FileIO>())
+  if (!has_interface<PPB_FileIO_1_0>())
     return cc.MayForce(PP_ERROR_NOINTERFACE);
-  return get_interface<PPB_FileIO>()->Touch(
+  return get_interface<PPB_FileIO_1_0>()->Touch(
       pp_resource(), last_access_time, last_modified_time,
       cc.pp_completion_callback());
 }
@@ -68,9 +68,9 @@ int32_t FileIO::Read(int64_t offset,
                      char* buffer,
                      int32_t bytes_to_read,
                      const CompletionCallback& cc) {
-  if (!has_interface<PPB_FileIO>())
+  if (!has_interface<PPB_FileIO_1_0>())
     return cc.MayForce(PP_ERROR_NOINTERFACE);
-  return get_interface<PPB_FileIO>()->Read(pp_resource(),
+  return get_interface<PPB_FileIO_1_0>()->Read(pp_resource(),
       offset, buffer, bytes_to_read, cc.pp_completion_callback());
 }
 
@@ -78,32 +78,32 @@ int32_t FileIO::Write(int64_t offset,
                       const char* buffer,
                       int32_t bytes_to_write,
                       const CompletionCallback& cc) {
-  if (!has_interface<PPB_FileIO>())
+  if (!has_interface<PPB_FileIO_1_0>())
     return cc.MayForce(PP_ERROR_NOINTERFACE);
-  return get_interface<PPB_FileIO>()->Write(
+  return get_interface<PPB_FileIO_1_0>()->Write(
       pp_resource(), offset, buffer, bytes_to_write,
       cc.pp_completion_callback());
 }
 
 int32_t FileIO::SetLength(int64_t length,
                           const CompletionCallback& cc) {
-  if (!has_interface<PPB_FileIO>())
+  if (!has_interface<PPB_FileIO_1_0>())
     return cc.MayForce(PP_ERROR_NOINTERFACE);
-  return get_interface<PPB_FileIO>()->SetLength(
+  return get_interface<PPB_FileIO_1_0>()->SetLength(
       pp_resource(), length, cc.pp_completion_callback());
 }
 
 int32_t FileIO::Flush(const CompletionCallback& cc) {
-  if (!has_interface<PPB_FileIO>())
+  if (!has_interface<PPB_FileIO_1_0>())
     return cc.MayForce(PP_ERROR_NOINTERFACE);
-  return get_interface<PPB_FileIO>()->Flush(
+  return get_interface<PPB_FileIO_1_0>()->Flush(
       pp_resource(), cc.pp_completion_callback());
 }
 
 void FileIO::Close() {
-  if (!has_interface<PPB_FileIO>())
+  if (!has_interface<PPB_FileIO_1_0>())
     return;
-  get_interface<PPB_FileIO>()->Close(pp_resource());
+  get_interface<PPB_FileIO_1_0>()->Close(pp_resource());
 }
 
 }  // namespace pp
diff --git a/ppapi/cpp/file_ref.cc b/ppapi/cpp/file_ref.cc
index 864e646..fbfd49b 100644
--- a/ppapi/cpp/file_ref.cc
+++ b/ppapi/cpp/file_ref.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -14,8 +14,8 @@ namespace pp {
 
 namespace {
 
-template <> const char* interface_name<PPB_FileRef>() {
-  return PPB_FILEREF_INTERFACE;
+template <> const char* interface_name<PPB_FileRef_1_0>() {
+  return PPB_FILEREF_INTERFACE_1_0;
 }
 
 }  // namespace
@@ -28,9 +28,9 @@ FileRef::FileRef(PassRef, PP_Resource resource) : Resource(PASS_REF, resource) {
 
 FileRef::FileRef(const FileSystem& file_system,
                  const char* path) {
-  if (!has_interface<PPB_FileRef>())
+  if (!has_interface<PPB_FileRef_1_0>())
     return;
-  PassRefFromConstructor(get_interface<PPB_FileRef>()->Create(
+  PassRefFromConstructor(get_interface<PPB_FileRef_1_0>()->Create(
       file_system.pp_resource(), path));
 }
 
@@ -39,34 +39,36 @@ FileRef::FileRef(const FileRef& other)
 }
 
 PP_FileSystemType FileRef::GetFileSystemType() const {
-  if (!has_interface<PPB_FileRef>())
+  if (!has_interface<PPB_FileRef_1_0>())
     return PP_FILESYSTEMTYPE_EXTERNAL;
-  return get_interface<PPB_FileRef>()->GetFileSystemType(pp_resource());
+  return get_interface<PPB_FileRef_1_0>()->GetFileSystemType(pp_resource());
 }
 
 Var FileRef::GetName() const {
-  if (!has_interface<PPB_FileRef>())
+  if (!has_interface<PPB_FileRef_1_0>())
     return Var();
-  return Var(PASS_REF, get_interface<PPB_FileRef>()->GetName(pp_resource()));
+  return Var(PASS_REF,
+             get_interface<PPB_FileRef_1_0>()->GetName(pp_resource()));
 }
 
 Var FileRef::GetPath() const {
-  if (!has_interface<PPB_FileRef>())
+  if (!has_interface<PPB_FileRef_1_0>())
     return Var();
-  return Var(PASS_REF, get_interface<PPB_FileRef>()->GetPath(pp_resource()));
+  return Var(PASS_REF,
+             get_interface<PPB_FileRef_1_0>()->GetPath(pp_resource()));
 }
 
 FileRef FileRef::GetParent() const {
-  if (!has_interface<PPB_FileRef>())
+  if (!has_interface<PPB_FileRef_1_0>())
     return FileRef();
   return FileRef(PASS_REF,
-                 get_interface<PPB_FileRef>()->GetParent(pp_resource()));
+                 get_interface<PPB_FileRef_1_0>()->GetParent(pp_resource()));
 }
 
 int32_t FileRef::MakeDirectory(const CompletionCallback& cc) {
-  if (!has_interface<PPB_FileRef>())
+  if (!has_interface<PPB_FileRef_1_0>())
     return cc.MayForce(PP_ERROR_NOINTERFACE);
-  return get_interface<PPB_FileRef>()->MakeDirectory(
+  return get_interface<PPB_FileRef_1_0>()->MakeDirectory(
       pp_resource(),
       PP_FALSE,  // make_ancestors
       cc.pp_completion_callback());
@@ -74,9 +76,9 @@ int32_t FileRef::MakeDirectory(const CompletionCallback& cc) {
 
 int32_t FileRef::MakeDirectoryIncludingAncestors(
     const CompletionCallback& cc) {
-  if (!has_interface<PPB_FileRef>())
+  if (!has_interface<PPB_FileRef_1_0>())
     return cc.MayForce(PP_ERROR_NOINTERFACE);
-  return get_interface<PPB_FileRef>()->MakeDirectory(
+  return get_interface<PPB_FileRef_1_0>()->MakeDirectory(
       pp_resource(),
       PP_TRUE,  // make_ancestors
       cc.pp_completion_callback());
@@ -85,25 +87,25 @@ int32_t FileRef::MakeDirectoryIncludingAncestors(
 int32_t FileRef::Touch(PP_Time last_access_time,
                        PP_Time last_modified_time,
                        const CompletionCallback& cc) {
-  if (!has_interface<PPB_FileRef>())
+  if (!has_interface<PPB_FileRef_1_0>())
     return cc.MayForce(PP_ERROR_NOINTERFACE);
-  return get_interface<PPB_FileRef>()->Touch(
+  return get_interface<PPB_FileRef_1_0>()->Touch(
       pp_resource(), last_access_time, last_modified_time,
       cc.pp_completion_callback());
 }
 
 int32_t FileRef::Delete(const CompletionCallback& cc) {
-  if (!has_interface<PPB_FileRef>())
+  if (!has_interface<PPB_FileRef_1_0>())
     return cc.MayForce(PP_ERROR_NOINTERFACE);
-  return get_interface<PPB_FileRef>()->Delete(
+  return get_interface<PPB_FileRef_1_0>()->Delete(
       pp_resource(), cc.pp_completion_callback());
 }
 
 int32_t FileRef::Rename(const FileRef& new_file_ref,
                         const CompletionCallback& cc) {
-  if (!has_interface<PPB_FileRef>())
+  if (!has_interface<PPB_FileRef_1_0>())
     return cc.MayForce(PP_ERROR_NOINTERFACE);
-  return get_interface<PPB_FileRef>()->Rename(
+  return get_interface<PPB_FileRef_1_0>()->Rename(
       pp_resource(), new_file_ref.pp_resource(), cc.pp_completion_callback());
 }
 
diff --git a/ppapi/cpp/file_system.cc b/ppapi/cpp/file_system.cc
index 1f2aaa6..022288c 100644
--- a/ppapi/cpp/file_system.cc
+++ b/ppapi/cpp/file_system.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -16,8 +16,8 @@ namespace pp {
 
 namespace {
 
-template <> const char* interface_name<PPB_FileSystem>() {
-  return PPB_FILESYSTEM_INTERFACE;
+template <> const char* interface_name<PPB_FileSystem_1_0>() {
+  return PPB_FILESYSTEM_INTERFACE_1_0;
 }
 
 }  // namespace
@@ -27,17 +27,17 @@ FileSystem::FileSystem() {
 
 FileSystem::FileSystem(const InstanceHandle& instance,
                        PP_FileSystemType type) {
-  if (!has_interface<PPB_FileSystem>())
+  if (!has_interface<PPB_FileSystem_1_0>())
     return;
-  PassRefFromConstructor(get_interface<PPB_FileSystem>()->Create(
+  PassRefFromConstructor(get_interface<PPB_FileSystem_1_0>()->Create(
       instance.pp_instance(), type));
 }
 
 int32_t FileSystem::Open(int64_t expected_size,
                          const CompletionCallback& cc) {
-  if (!has_interface<PPB_FileSystem>())
+  if (!has_interface<PPB_FileSystem_1_0>())
     return cc.MayForce(PP_ERROR_NOINTERFACE);
-  return get_interface<PPB_FileSystem>()->Open(
+  return get_interface<PPB_FileSystem_1_0>()->Open(
       pp_resource(), expected_size, cc.pp_completion_callback());
 }