2 files changed, 8 insertions, 10 deletions
diff --git a/webkit/glue/plugins/plugin_instance.cc b/webkit/glue/plugins/plugin_instance.cc
index 405acb5..62e1357 100644
--- a/webkit/glue/plugins/plugin_instance.cc
+++ b/webkit/glue/plugins/plugin_instance.cc
@@ -45,9 +45,7 @@
 
 namespace NPAPI
 {
-
-// TODO(evanm): don't rely on static initialization.
-ThreadLocalStorage::Slot PluginInstance::plugin_instance_tls_index_;
+int PluginInstance::plugin_instance_tls_index_ = ThreadLocalStorage::Alloc();
 
 PluginInstance::PluginInstance(PluginLib *plugin, const std::string &mime_type)
     : plugin_(plugin),
@@ -431,16 +429,17 @@ void PluginInstance::OnPluginThreadAsyncCall(void (*func)(void *),
 PluginInstance* PluginInstance::SetInitializingInstance(
     PluginInstance* instance) {
   PluginInstance* old_instance =
-      static_cast<PluginInstance*>(plugin_instance_tls_index_.Get());
-  plugin_instance_tls_index_.Set(instance);
+      static_cast<PluginInstance*>(
+          ThreadLocalStorage::Get(plugin_instance_tls_index_));
+  ThreadLocalStorage::Set(plugin_instance_tls_index_, instance);
   return old_instance;
 }
 
 PluginInstance* PluginInstance::GetInitializingInstance() {
   PluginInstance* instance =
-      static_cast<PluginInstance*>(plugin_instance_tls_index_.Get());
-  return instance;
-}
+      static_cast<PluginInstance*>(
+          ThreadLocalStorage::Get(plugin_instance_tls_index_));
+  return instance;}
 
 NPError PluginInstance::GetServiceManager(void** service_manager) {
   if (!mozilla_extenstions_) {
diff --git a/webkit/glue/plugins/plugin_instance.h b/webkit/glue/plugins/plugin_instance.h
index 6cbfd5a..5743c24 100644
--- a/webkit/glue/plugins/plugin_instance.h
+++ b/webkit/glue/plugins/plugin_instance.h
@@ -40,7 +40,6 @@
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
-#include "base/thread_local_storage.h"
 #include "webkit/glue/plugins/nphostapi.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/npapi/bindings/npapi.h"
@@ -262,7 +261,7 @@ class PluginInstance : public base::RefCounted<PluginInstance> {
   // We need to pass this instance to the service manager 
   // (MozillaExtensionApi) created as a result of NPN_GetValue
   // in the context of NP_Initialize. 
-  static ThreadLocalStorage::Slot          plugin_instance_tls_index_;
+  static int                               plugin_instance_tls_index_;
   scoped_refptr<PluginDataStream>          plugin_data_stream_;
   GURL                                     instance_url_;