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

webkit/plugins/ppapi/ppb_broker_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_broker_impl.h"
 
 #include "base/logging.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 
@@ skipping 51 matching lines @@
 
   if (broker_) {
     // May only be called once.
     return PP_ERROR_FAILED;
   }
 
   // The callback must be populated now in case we are connected to the broker
   // and BrokerConnected is called before ConnectToPpapiBroker returns.
   // Because it must be created now, it must be aborted and cleared if
   // ConnectToPpapiBroker fails.
-  PP_Resource resource_id = GetReferenceNoAddRef();
-  CHECK(resource_id);
   connect_callback_ = new TrackedCompletionCallback(
-      instance()->module()->GetCallbackTracker(), resource_id,
+      instance()->module()->GetCallbackTracker(), pp_resource(),
       connect_callback);
 
   broker_ = instance()->delegate()->ConnectToPpapiBroker(this);
   if (!broker_) {
     scoped_refptr<TrackedCompletionCallback> callback;
     callback.swap(connect_callback_);
     callback->Abort();
     return PP_ERROR_FAILED;
   }
 
@@ skipping 19 matching lines @@
   // Synchronous calls are not supported.
   DCHECK(connect_callback_.get() && !connect_callback_->completed());
 
   scoped_refptr<TrackedCompletionCallback> callback;
   callback.swap(connect_callback_);
   callback->Run(result);  // Will complete abortively if necessary.
 }
 
 }  // namespace ppapi
 }  // namespace webkit