Revert 106142 - Add a new globals object for PPAPI tracking information.

webkit/plugins/ppapi/plugin_object.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/plugin_object.h"
 
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/npruntime.h"
 #include "ppapi/c/dev/ppb_var_deprecated.h"
 #include "ppapi/c/dev/ppp_class_deprecated.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_var.h"
-#include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/var.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
 #include "webkit/plugins/ppapi/npapi_glue.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/resource_tracker.h"
 #include "webkit/plugins/ppapi/string.h"
 
-using ppapi::PpapiGlobals;
 using ppapi::StringVar;
 using ppapi::Var;
 using WebKit::WebBindings;
 
 namespace webkit {
 namespace ppapi {
 
 namespace {
 
 const char kInvalidValueException[] = "Error: Invalid value";
@@ skipping 107 matching lines @@
   NPObjectAccessorWithIdentifier accessor(object, property_name, true);
   if (!accessor.is_valid())
     return false;
 
   PPResultAndExceptionToNPResult result_converter(
       accessor.object()->GetNPObject(), NULL);
   PP_Var value_var = NPVariantToPPVar(accessor.object()->instance(), value);
   accessor.object()->ppp_class()->SetProperty(
       accessor.object()->ppp_class_data(), accessor.identifier(), value_var,
       result_converter.exception());
-  PpapiGlobals::Get()->GetVarTracker()->ReleaseVar(value_var);
+  ResourceTracker::Get()->GetVarTracker()->ReleaseVar(value_var);
   return result_converter.CheckExceptionForNoResult();
 }
 
 bool WrapperClass_RemoveProperty(NPObject* object, NPIdentifier property_name) {
   NPObjectAccessorWithIdentifier accessor(object, property_name, true);
   if (!accessor.is_valid())
     return false;
 
   PPResultAndExceptionToNPResult result_converter(
       accessor.object()->GetNPObject(), NULL);
@@ skipping 44 matching lines @@
       }
     }
   }
 
   // This will actually throw the exception, either from GetAllPropertyNames,
   // or if anything was set during the conversion process.
   result_converter.CheckExceptionForNoResult();
 
   // Release the PP_Var that the plugin allocated. On success, they will all
   // be converted to NPVariants, and on failure, we want them to just go away.
-  ::ppapi::VarTracker* var_tracker = PpapiGlobals::Get()->GetVarTracker();
+  ::ppapi::VarTracker* var_tracker = ResourceTracker::Get()->GetVarTracker();
   for (uint32_t i = 0; i < property_count; ++i)
     var_tracker->ReleaseVar(properties[i]);
   free(properties);
   return result_converter.success();
 }
 
 bool WrapperClass_Construct(NPObject* object, const NPVariant* argv,
                             uint32_t argc, NPVariant* result) {
   PluginObject* obj = PluginObject::FromNPObject(object);
   if (!obj)
@@ skipping 119 matching lines @@
 // static
 NPObject* PluginObject::AllocateObjectWrapper() {
   NPObjectWrapper* wrapper = new NPObjectWrapper;
   memset(wrapper, 0, sizeof(NPObjectWrapper));
   return wrapper;
 }
 
 }  // namespace ppapi
 }  // namespace webkit