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

webkit/plugins/ppapi/ppb_flash_menu_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_flash_menu_impl.h"
 
 #include "base/utf_string_conversions.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ui/gfx/point.h"
 #include "webkit/glue/webmenuitem.h"
@@ skipping 123 matching lines @@
     return PP_ERROR_BADARGUMENT;
 
   if (!callback.func) {
     NOTIMPLEMENTED();
     return PP_ERROR_BADARGUMENT;
   }
 
   if (callback_.get() && !callback_->completed())
     return PP_ERROR_INPROGRESS;
 
-  PP_Resource resource_id = GetReferenceNoAddRef();
-  if (!resource_id) {
-    NOTREACHED();
-    return PP_ERROR_FAILED;
-  }
-
   int32_t rv = instance()->delegate()->ShowContextMenu(
       instance(), this, gfx::Point(location->x, location->y));
   if (rv == PP_OK_COMPLETIONPENDING) {
     // Record callback and output buffers.
     callback_ = new TrackedCompletionCallback(
-        instance()->module()->GetCallbackTracker(), resource_id, callback);
+        instance()->module()->GetCallbackTracker(), pp_resource(), callback);
     selected_id_out_ = selected_id_out;
   } else {
     // This should never be completed synchronously successfully.
     DCHECK_NE(rv, PP_OK);
   }
   return rv;
 
   NOTIMPLEMENTED();
   return PP_ERROR_FAILED;
 }
@@ skipping 19 matching lines @@
 
   scoped_refptr<TrackedCompletionCallback> callback;
   callback.swap(callback_);
   selected_id_out_ = NULL;
 
   callback->Run(rv);  // Will complete abortively if necessary.
 }
 
 }  // namespace ppapi
 }  // namespace webkit