Merge 197686 "Remove Pepper URLLoader from resource tracker early."

ppapi/shared_impl/resource.cc

Index: ppapi/shared_impl/resource.cc
===================================================================
--- ppapi/shared_impl/resource.cc	(revision 198489)
+++ ppapi/shared_impl/resource.cc	(working copy)
@@ -45,7 +45,7 @@
 }
 
 Resource::~Resource() {
-  PpapiGlobals::Get()->GetResourceTracker()->RemoveResource(this);
+  RemoveFromResourceTracker();
 }
 
 PP_Resource Resource::GetReference() {
@@ -79,6 +79,10 @@
                                      message);
 }
 
+void Resource::RemoveFromResourceTracker() {
+  PpapiGlobals::Get()->GetResourceTracker()->RemoveResource(this);
+}
+
 #define DEFINE_TYPE_GETTER(RESOURCE) \
   thunk::RESOURCE* Resource::As##RESOURCE() { return NULL; }
 FOR_ALL_PPAPI_RESOURCE_APIS(DEFINE_TYPE_GETTER)