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

webkit/plugins/ppapi/ppb_directory_reader_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_directory_reader_impl.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/dev/ppb_directory_reader_dev.h"
-#include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_file_ref_api.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/file_callbacks.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/ppb_file_ref_impl.h"
 #include "webkit/plugins/ppapi/ppb_file_system_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_DirectoryReader_API;
 using ::ppapi::thunk::PPB_FileRef_API;
 
 namespace webkit {
 namespace ppapi {
 
 namespace {
 
 std::string FilePathStringToUTF8String(const FilePath::StringType& str) {
@@ skipping 87 matching lines @@
 
   FillUpEntry();
   entry_ = NULL;
 }
 
 bool PPB_DirectoryReader_Impl::FillUpEntry() {
   DCHECK(entry_);
   if (!entries_.empty()) {
     base::FileUtilProxy::Entry dir_entry = entries_.front();
     entries_.pop();
-    if (entry_->file_ref) {
-      PpapiGlobals::Get()->GetResourceTracker()->ReleaseResource(
-          entry_->file_ref);
-    }
+    if (entry_->file_ref)
+      ResourceTracker::Get()->ReleaseResource(entry_->file_ref);
 
     PPB_FileRef_Impl* file_ref = PPB_FileRef_Impl::CreateInternal(
         directory_ref_->file_system()->pp_resource(),
         FilePathStringToUTF8String(dir_entry.name));
     if (!file_ref)
       return false;
     entry_->file_ref = file_ref->GetReference();
     entry_->file_type =
         (dir_entry.is_directory ? PP_FILETYPE_DIRECTORY : PP_FILETYPE_REGULAR);
     return true;
   }
 
   if (!has_more_) {
     entry_->file_ref = 0;
     return true;
   }
 
   return false;
 }
 
 }  // namespace ppapi
 }  // namespace webkit