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

webkit/plugins/ppapi/ppb_audio_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_audio_impl.h"
 
 #include "base/logging.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/ppb_audio.h"
 #include "ppapi/c/ppb_audio_config.h"
 #include "ppapi/c/trusted/ppb_audio_trusted.h"
 #include "ppapi/shared_impl/resource_tracker.h"
 #include "ppapi/shared_impl/tracker_base.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_audio_config_api.h"
 #include "ppapi/thunk/thunk.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/resource_helper.h"
 
-using ppapi::PpapiGlobals;
 using ppapi::thunk::EnterResourceNoLock;
 using ppapi::thunk::PPB_Audio_API;
 using ppapi::thunk::PPB_AudioConfig_API;
 
 namespace webkit {
 namespace ppapi {
 
 // PPB_Audio_Impl --------------------------------------------------------------
 
 PPB_Audio_Impl::PPB_Audio_Impl(PP_Instance instance)
@@ skipping 57 matching lines @@
   // When the stream is created, we'll get called back on StreamCreated().
   CHECK(!audio_);
   audio_ = plugin_delegate->CreateAudio(enter.object()->GetSampleRate(),
                                         enter.object()->GetSampleFrameCount(),
                                         this);
   return audio_ != NULL;
 }
 
 PP_Resource PPB_Audio_Impl::GetCurrentConfig() {
   // AddRef on behalf of caller, while keeping a ref for ourselves.
-  PpapiGlobals::Get()->GetResourceTracker()->AddRefResource(config_);
+  ::ppapi::TrackerBase::Get()->GetResourceTracker()->AddRefResource(config_);
   return config_;
 }
 
 PP_Bool PPB_Audio_Impl::StartPlayback() {
   if (!audio_)
     return PP_FALSE;
   if (playing())
     return PP_TRUE;
   SetStartPlaybackState();
   return BoolToPPBool(audio_->StartPlayback());
@@ skipping 91 matching lines @@
     // something more elaborate like an ACK from the plugin or post a task to
     // the I/O thread and back, but this extra complexity doesn't seem worth it
     // just to clean up these handles faster.
   } else {
     SetStreamInfo(shared_memory_handle, shared_memory_size, socket_handle);
   }
 }
 
 }  // namespace ppapi
 }  // namespace webkit