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

webkit/plugins/ppapi/callbacks_unittest.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/ppapi_unittest.h"
 
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "webkit/plugins/ppapi/callbacks.h"
-#include "webkit/plugins/ppapi/host_globals.h"
 #include "webkit/plugins/ppapi/mock_resource.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/resource_helper.h"
 #include "webkit/plugins/ppapi/resource_tracker.h"
 
 namespace webkit {
 namespace ppapi {
 
 struct CallbackRunInfo {
@@ skipping 155 matching lines @@
 
 }  // namespace
 
 class CallbackResourceTest : public PpapiUnittest {
  public:
   CallbackResourceTest() {}
 };
 
 // Test that callbacks get aborted on the last resource unref.
 TEST_F(CallbackResourceTest, AbortOnNoRef) {
-  ResourceTracker* resource_tracker =
-      HostGlobals::Get()->host_resource_tracker();
+  ResourceTracker* resource_tracker = ResourceTracker::Get();
 
   // Test several things: Unref-ing a resource (to zero refs) with callbacks
   // which (1) have been run, (2) have been aborted, (3) haven't been completed.
   // Check that the uncompleted one gets aborted, and that the others don't get
   // called again.
   scoped_refptr<CallbackMockResource> resource_1(
       new CallbackMockResource(instance()->pp_instance()));
   PP_Resource resource_1_id = resource_1->SetupForTest();
 
   // Also do the same for a second resource, and make sure that unref-ing the
@@ skipping 18 matching lines @@
   resource_1->CheckFinalState();
   resource_2->CheckFinalState();
 
   // This shouldn't be needed, but make sure there are no stranded tasks.
   MessageLoop::current()->RunAllPending();
 }
 
 // Test that "resurrecting" a resource (getting a new ID for a |Resource|)
 // doesn't resurrect callbacks.
 TEST_F(CallbackResourceTest, Resurrection) {
-  ResourceTracker* resource_tracker =
-      HostGlobals::Get()->host_resource_tracker();
+  ResourceTracker* resource_tracker = ResourceTracker::Get();
 
   scoped_refptr<CallbackMockResource> resource(
       new CallbackMockResource(instance()->pp_instance()));
   PP_Resource resource_id = resource->SetupForTest();
 
   // Unref it, spin the message loop to run posted calls, and check that things
   // are in the expected states.
   resource_tracker->ReleaseResource(resource_id);
   MessageLoop::current()->RunAllPending();
   resource->CheckFinalState();
 
   // "Resurrect" it and check that the callbacks are still dead.
   PP_Resource new_resource_id = resource->GetReference();
   MessageLoop::current()->RunAllPending();
   resource->CheckFinalState();
 
   // Unref it again and do the same.
   resource_tracker->ReleaseResource(new_resource_id);
   MessageLoop::current()->RunAllPending();
   resource->CheckFinalState();
 
   // This shouldn't be needed, but make sure there are no stranded tasks.
   MessageLoop::current()->RunAllPending();
 }
 
 }  // namespace ppapi
 }  // namespace webkit