Move a bunch of code from the old to new TLS interface.

chrome/renderer/render_thread.h

 // Copyright (c) 2006-2008 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.
 
 #ifndef CHROME_RENDERER_RENDER_THREAD_H__
 #define CHROME_RENDERER_RENDER_THREAD_H__
 
 #include "base/ref_counted.h"
 #include "base/shared_memory.h"
 #include "base/task.h"
 #include "base/thread.h"
-#include "base/thread_local_storage.h"
 #include "chrome/common/ipc_sync_channel.h"
 #include "chrome/common/message_router.h"
 
 class SkBitmap;
 class Task;
 class VisitedLinkSlave;
 struct WebPreferences;
 class RenderDnsMaster;
 class NotificationService;
 
@@ skipping 18 matching lines @@
   virtual void OnMessageReceived(const IPC::Message& msg);
   virtual void OnChannelError();
 
   // IPC::Message::Sender implementation:
   virtual bool Send(IPC::Message* msg);
 
   void AddFilter(IPC::ChannelProxy::MessageFilter* filter);
   void RemoveFilter(IPC::ChannelProxy::MessageFilter* filter);
 
   // The RenderThread instance for the current thread.
-  static RenderThread* current() {
-    return static_cast<RenderThread*>(tls_index_.Get());
-  }
+  static RenderThread* current();
 
   VisitedLinkSlave* visited_link_slave() const { return visited_link_slave_; }
 
   // Do DNS prefetch resolution of a hostname.
   void Resolve(const char* name, size_t length);
 
   // See documentation on MessageRouter for AddRoute and RemoveRoute
   void AddRoute(int32 routing_id, IPC::Channel::Listener* listener);
   void RemoveRoute(int32 routing_id);
 
@@ skipping 23 matching lines @@
   void OnSetCacheCapacities(size_t min_dead_capacity,
                             size_t max_dead_capacity,
                             size_t capacity);
   void OnGetCacheResourceStats();
 
   // Gather usage statistics from the in-memory cache and inform our host.
   // These functions should be call periodically so that the host can make
   // decisions about how to allocation resources using current information.
   void InformHostOfCacheStats();
 
-  static TLSSlot tls_index_;
-
   // The message loop used to run tasks on the thread that started this thread.
   MessageLoop* owner_loop_;
 
   // Used only on the background render thread to implement message routing
   // functionality to the consumers of the RenderThread.
   MessageRouter router_;
 
   std::wstring channel_name_;
   scoped_ptr<IPC::SyncChannel> channel_;
 
   // These objects live solely on the render thread.
   VisitedLinkSlave* visited_link_slave_;
 
   scoped_ptr<RenderDnsMaster> render_dns_master_;
 
   scoped_ptr<ScopedRunnableMethodFactory<RenderThread> > cache_stats_factory_;
 
   scoped_ptr<NotificationService> notification_service_;
 
   int in_send_;
 
   DISALLOW_EVIL_CONSTRUCTORS(RenderThread);
 };
 
 #endif  // CHROME_RENDERER_RENDER_THREAD_H__