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

webkit/plugins/ppapi/ppb_video_capture_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_video_capture_impl.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/logging.h"
 #include "ppapi/c/dev/pp_video_capture_dev.h"
 #include "ppapi/c/dev/ppb_video_capture_dev.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
-#include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/thunk/enter.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/ppb_buffer_impl.h"
 #include "webkit/plugins/ppapi/resource_helper.h"
 #include "webkit/plugins/ppapi/resource_tracker.h"
 
-using ppapi::PpapiGlobals;
 using ppapi::thunk::EnterResourceNoLock;
 using ppapi::thunk::PPB_Buffer_API;
 using ppapi::thunk::PPB_VideoCapture_API;
 
 namespace {
 
 // Maximum number of buffers to actually allocate.
 const uint32_t kMaxBuffers = 20;
 
 }  // namespace
@@ skipping 225 matching lines @@
     if (!resources[i])
       break;
 
     EnterResourceNoLock<PPB_Buffer_API> enter(resources[i], true);
     DCHECK(enter.succeeded());
 
     BufferInfo info;
     info.buffer = static_cast<PPB_Buffer_Impl*>(enter.object());
     info.data = info.buffer->Map();
     if (!info.data) {
-      PpapiGlobals::Get()->GetResourceTracker()->ReleaseResource(resources[i]);
+      ResourceTracker::Get()->ReleaseResource(resources[i]);
       break;
     }
     buffers_.push_back(info);
   }
 
   if (buffers_.empty()) {
     // We couldn't allocate/map buffers at all. Send an error and stop the
     // capture.
     ppp_videocapture_->OnError(pp_instance(), pp_resource(), PP_ERROR_NOMEMORY);
     status_ = PP_VIDEO_CAPTURE_STATUS_STOPPING;
     platform_video_capture_->StopCapture(this);
     return;
   }
 
   ppp_videocapture_->OnDeviceInfo(pp_instance(), pp_resource(), &info,
                                   buffers_.size(), resources.get());
 }
 
 void PPB_VideoCapture_Impl::ReleaseBuffers() {
   DCHECK(!is_dead_);
-  ::ppapi::ResourceTracker* tracker = PpapiGlobals::Get()->GetResourceTracker();
+  ResourceTracker *tracker = ResourceTracker::Get();
   for (size_t i = 0; i < buffers_.size(); ++i) {
     buffers_[i].buffer->Unmap();
     tracker->ReleaseResource(buffers_[i].buffer->pp_resource());
   }
   buffers_.clear();
 }
 
 void PPB_VideoCapture_Impl::SendStatus() {
   DCHECK(!is_dead_);
   ppp_videocapture_->OnStatus(pp_instance(), pp_resource(), status_);
 }
 
 PPB_VideoCapture_Impl::BufferInfo::BufferInfo()
     : in_use(false),
       data(NULL),
       buffer() {
 }
 
 PPB_VideoCapture_Impl::BufferInfo::~BufferInfo() {
 }
 
 }  // namespace ppapi
 }  // namespace webkit