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

webkit/plugins/ppapi/ppb_file_chooser_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_chooser_impl.h"
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 62 matching lines @@
 PPB_FileChooser_Impl::~PPB_FileChooser_Impl() {
 }
 
 // static
 PP_Resource PPB_FileChooser_Impl::Create(
     PluginInstance* instance,
     const PP_FileChooserOptions_Dev* options) {
   if ((options->mode != PP_FILECHOOSERMODE_OPEN) &&
       (options->mode != PP_FILECHOOSERMODE_OPENMULTIPLE))
     return 0;
-
-  PPB_FileChooser_Impl* chooser = new PPB_FileChooser_Impl(instance, options);
-  return chooser->GetReference();
+  return (new PPB_FileChooser_Impl(instance, options))->GetReference();
 }
 
 PPB_FileChooser_Impl* PPB_FileChooser_Impl::AsPPB_FileChooser_Impl() {
   return this;
 }
 
 PPB_FileChooser_API* PPB_FileChooser_Impl::AsPPB_FileChooser_API() {
   return this;
 }
 
@@ skipping 26 matching lines @@
     return PP_ERROR_INPROGRESS;
 
   return PP_OK;
 }
 
 void PPB_FileChooser_Impl::RegisterCallback(
     const PP_CompletionCallback& callback) {
   DCHECK(callback.func);
   DCHECK(!callback_.get() || callback_->completed());
 
-  PP_Resource resource_id = GetReferenceNoAddRef();
-  CHECK(resource_id);
   callback_ = new TrackedCompletionCallback(
-      instance()->module()->GetCallbackTracker(), resource_id, callback);
+      instance()->module()->GetCallbackTracker(), pp_resource(), callback);
 }
 
 void PPB_FileChooser_Impl::RunCallback(int32_t result) {
   scoped_refptr<TrackedCompletionCallback> callback;
   callback.swap(callback_);
   callback->Run(result);  // Will complete abortively if necessary.
 }
 
 int32_t PPB_FileChooser_Impl::Show(PP_CompletionCallback callback) {
   int32_t rv = ValidateCallback(callback);
@@ skipping 18 matching lines @@
 
 PP_Resource PPB_FileChooser_Impl::GetNextChosenFile() {
   if (next_chosen_file_index_ >= chosen_files_.size())
     return 0;
 
   return chosen_files_[next_chosen_file_index_++]->GetReference();
 }
 
 }  // namespace ppapi
 }  // namespace webkit