Add a unified resource tracker shared between the proxy and the impl.

webkit/plugins/ppapi/ppb_file_ref_impl.cc

 // 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 "webkit/plugins/ppapi/ppb_file_ref_impl.h"
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
 #include "ppapi/c/pp_errors.h"
@@ skipping 79 matching lines @@
 
   if (file_system->type() != PP_FILESYSTEMTYPE_LOCALPERSISTENT &&
       file_system->type() != PP_FILESYSTEMTYPE_LOCALTEMPORARY)
     return 0;
 
   std::string validated_path(path);
   if (!IsValidLocalPath(validated_path))
     return 0;
   TrimTrailingSlash(&validated_path);
 
-  PPB_FileRef_Impl* file_ref =
-      new PPB_FileRef_Impl(file_system->instance(),
-                           file_system, validated_path);
-  return file_ref->GetReference();
+  return (new PPB_FileRef_Impl(file_system->instance(),
+                               file_system, validated_path))->GetReference();
 }
 
 PPB_FileRef_API* PPB_FileRef_Impl::AsPPB_FileRef_API() {
   return this;
 }
 
 PPB_FileRef_Impl* PPB_FileRef_Impl::AsPPB_FileRef_Impl() {
   return this;
 }
 
@@ skipping 55 matching lines @@
   return parent_ref->GetReference();
 }
 
 int32_t PPB_FileRef_Impl::MakeDirectory(PP_Bool make_ancestors,
                                         PP_CompletionCallback callback) {
   if (!IsValidNonExternalFileSystem())
     return PP_ERROR_NOACCESS;
   if (!instance()->delegate()->MakeDirectory(
           GetFileSystemURL(), PP_ToBool(make_ancestors),
           new FileCallbacks(instance()->module()->AsWeakPtr(),
-                            GetReferenceNoAddRef(), callback,
-                            NULL, NULL, NULL)))
+                            pp_resource(), callback, NULL, NULL, NULL)))
     return PP_ERROR_FAILED;
   return PP_OK_COMPLETIONPENDING;
 }
 
 int32_t PPB_FileRef_Impl::Touch(PP_Time last_access_time,
                                 PP_Time last_modified_time,
                                 PP_CompletionCallback callback) {
   if (!IsValidNonExternalFileSystem())
     return PP_ERROR_NOACCESS;
   if (!instance()->delegate()->Touch(
           GetFileSystemURL(),
           PPTimeToTime(last_access_time),
           PPTimeToTime(last_modified_time),
           new FileCallbacks(instance()->module()->AsWeakPtr(),
-                            GetReferenceNoAddRef(), callback,
-                            NULL, NULL, NULL)))
+                            pp_resource(), callback, NULL, NULL, NULL)))
     return PP_ERROR_FAILED;
   return PP_OK_COMPLETIONPENDING;
 }
 
 int32_t PPB_FileRef_Impl::Delete(PP_CompletionCallback callback) {
   if (!IsValidNonExternalFileSystem())
     return PP_ERROR_NOACCESS;
   if (!instance()->delegate()->Delete(
           GetFileSystemURL(),
           new FileCallbacks(instance()->module()->AsWeakPtr(),
-                            GetReferenceNoAddRef(), callback,
-                            NULL, NULL, NULL)))
+                            pp_resource(), callback, NULL, NULL, NULL)))
     return PP_ERROR_FAILED;
   return PP_OK_COMPLETIONPENDING;
 }
 
 int32_t PPB_FileRef_Impl::Rename(PP_Resource new_pp_file_ref,
                                  PP_CompletionCallback callback) {
   EnterResourceNoLock<PPB_FileRef_API> enter(new_pp_file_ref, true);
   if (enter.failed())
     return PP_ERROR_BADRESOURCE;
   PPB_FileRef_Impl* new_file_ref =
       static_cast<PPB_FileRef_Impl*>(enter.object());
 
   if (!IsValidNonExternalFileSystem() ||
       file_system_.get() != new_file_ref->file_system_.get())
     return PP_ERROR_NOACCESS;
 
   // TODO(viettrungluu): Also cancel when the new file ref is destroyed?
   // http://crbug.com/67624
   if (!instance()->delegate()->Rename(
           GetFileSystemURL(), new_file_ref->GetFileSystemURL(),
           new FileCallbacks(instance()->module()->AsWeakPtr(),
-                            GetReferenceNoAddRef(), callback,
-                            NULL, NULL, NULL)))
+                            pp_resource(), callback, NULL, NULL, NULL)))
     return PP_ERROR_FAILED;
   return PP_OK_COMPLETIONPENDING;
 }
 
 FilePath PPB_FileRef_Impl::GetSystemPath() const {
   if (GetFileSystemType() != PP_FILESYSTEMTYPE_EXTERNAL) {
     NOTREACHED();
     return FilePath();
   }
   return system_path_;
@@ skipping 15 matching lines @@
   return GURL(file_system_->root_url().spec() + virtual_path_.substr(1));
 }
 
 bool PPB_FileRef_Impl::IsValidNonExternalFileSystem() const {
   return file_system_ && file_system_->opened() &&
       file_system_->type() != PP_FILESYSTEMTYPE_EXTERNAL;
 }
 
 }  // namespace ppapi
 }  // namespace webkit