Revert 189518 "PPAPI: Remove threading options; it's always on"

trunk/src/webkit/plugins/ppapi/host_globals.cc

 // Copyright (c) 2012 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/host_globals.h"
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "base/utf_string_conversions.h"
 #include "ppapi/shared_impl/api_id.h"
 #include "ppapi/shared_impl/id_assignment.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h"
 #include "webkit/plugins/plugin_switches.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 
 using ppapi::CheckIdType;
 using ppapi::MakeTypedId;
 using ppapi::PPIdType;
-using ppapi::ResourceTracker;
 using WebKit::WebConsoleMessage;
 using WebKit::WebString;
 
 namespace webkit {
 namespace ppapi {
 
 namespace {
 
 typedef std::set<WebKit::WebPluginContainer*> ContainerSet;
 
@@ skipping 29 matching lines @@
     result.append(": ");
   result.append(message);
   return WebConsoleMessage(LogLevelToWebLogLevel(level),
                            WebString(UTF8ToUTF16(result)));
 }
 
 }  // namespace
 
 HostGlobals* HostGlobals::host_globals_ = NULL;
 
-HostGlobals::HostGlobals()
-    : ::ppapi::PpapiGlobals(),
-      resource_tracker_(ResourceTracker::SINGLE_THREADED) {
+HostGlobals::HostGlobals() : ::ppapi::PpapiGlobals() {
   DCHECK(!host_globals_);
   host_globals_ = this;
 }
 
 HostGlobals::HostGlobals(
     ::ppapi::PpapiGlobals::PerThreadForTest per_thread_for_test)
-    : ::ppapi::PpapiGlobals(per_thread_for_test),
-      resource_tracker_(ResourceTracker::SINGLE_THREADED) {
+    : ::ppapi::PpapiGlobals(per_thread_for_test) {
   DCHECK(!host_globals_);
 }
 
 HostGlobals::~HostGlobals() {
   DCHECK(host_globals_ == this || !host_globals_);
   host_globals_ = NULL;
 }
 
 ::ppapi::ResourceTracker* HostGlobals::GetResourceTracker() {
   return &resource_tracker_;
@@ skipping 167 matching lines @@
     return NULL;
   return found->second;
 }
 
 bool HostGlobals::IsHostGlobals() const {
   return true;
 }
 
 }  // namespace ppapi
 }  // namespace webkit