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

webkit/plugins/ppapi/ppb_directory_reader_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_directory_reader_impl.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
@@ skipping 49 matching lines @@
 }
 
 PPB_DirectoryReader_Impl::~PPB_DirectoryReader_Impl() {
 }
 
 // static
 PP_Resource PPB_DirectoryReader_Impl::Create(PP_Resource directory_ref) {
   EnterResourceNoLock<PPB_FileRef_API> enter(directory_ref, true);
   if (enter.failed())
     return 0;
-
-  PPB_DirectoryReader_Impl* reader = new PPB_DirectoryReader_Impl(
-      static_cast<PPB_FileRef_Impl*>(enter.object()));
-  return reader->GetReference();
+  return (new PPB_DirectoryReader_Impl(
+      static_cast<PPB_FileRef_Impl*>(enter.object())))->GetReference();
 }
 
 PPB_DirectoryReader_API* PPB_DirectoryReader_Impl::AsPPB_DirectoryReader_API() {
   return this;
 }
 
 int32_t PPB_DirectoryReader_Impl::GetNextEntry(
     PP_DirectoryEntry_Dev* entry,
     PP_CompletionCallback callback) {
   if (directory_ref_->GetFileSystemType() == PP_FILESYSTEMTYPE_EXTERNAL)
     return PP_ERROR_FAILED;
 
   entry_ = entry;
   if (FillUpEntry()) {
     entry_ = NULL;
     return PP_OK;
   }
 
   PluginInstance* instance = directory_ref_->instance();
-  PP_Resource resource_id = GetReferenceNoAddRef();
-  DCHECK(resource_id != 0);
   if (!instance->delegate()->ReadDirectory(
           directory_ref_->GetFileSystemURL(),
           new FileCallbacks(instance->module()->AsWeakPtr(),
-                            resource_id,
-                            callback, NULL, NULL, this)))
+                            pp_resource(), callback, NULL, NULL, this)))
     return PP_ERROR_FAILED;
 
   return PP_OK_COMPLETIONPENDING;
 }
 
 void PPB_DirectoryReader_Impl::AddNewEntries(
     const std::vector<base::FileUtilProxy::Entry>& entries, bool has_more) {
   DCHECK(!entries.empty() || !has_more);
   has_more_ = has_more;
   std::string dir_path = directory_ref_->virtual_path();
@@ skipping 11 matching lines @@
   FillUpEntry();
   entry_ = NULL;
 }
 
 bool PPB_DirectoryReader_Impl::FillUpEntry() {
   DCHECK(entry_);
   if (!entries_.empty()) {
     base::FileUtilProxy::Entry dir_entry = entries_.front();
     entries_.pop();
     if (entry_->file_ref)
-      ResourceTracker::Get()->UnrefResource(entry_->file_ref);
+      ResourceTracker::Get()->ReleaseResource(entry_->file_ref);
     PPB_FileRef_Impl* file_ref =
         new PPB_FileRef_Impl(instance(), directory_ref_->file_system(),
                              FilePathStringToUTF8String(dir_entry.name));
     entry_->file_ref = file_ref->GetReference();
     entry_->file_type =
         (dir_entry.is_directory ? PP_FILETYPE_DIRECTORY : PP_FILETYPE_REGULAR);
     return true;
   }
 
   if (!has_more_) {
     entry_->file_ref = 0;
     return true;
   }
 
   return false;
 }
 
 }  // namespace ppapi
 }  // namespace webkit