Make the global render thread object a regular global object rather than a

special TLS value. This is slightly faster for this commonly-used function, and
we don't ever have more than one (it's like this because we were originally
planning on having more than one RenderThread).

BUG=5635
Review URL: http://codereview.chromium.org/15052

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7272 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 14 deletions

diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index 60ac402..9a4e4ed 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -7,9 +7,7 @@
 
 #include "chrome/renderer/render_thread.h"
 
-#include "base/lazy_instance.h"
 #include "base/shared_memory.h"
-#include "base/thread_local.h"
 #include "chrome/common/chrome_plugin_lib.h"
 #include "chrome/common/ipc_logging.h"
 #include "chrome/common/notification_service.h"
@@ -21,22 +19,16 @@
 #include "chrome/renderer/visitedlink_slave.h"
 #include "webkit/glue/cache_manager.h"
 
+RenderThread* g_render_thread;
+
 static const unsigned int kCacheStatsDelayMS = 2000 /* milliseconds */;
 
 // V8 needs a 1MB stack size.
 static const size_t kStackSize = 1024 * 1024;
 
-static base::LazyInstance<base::ThreadLocalPointer<RenderThread> >
-    lazy_tls_ptr(base::LINKER_INITIALIZED);
-
 //-----------------------------------------------------------------------------
 // Methods below are only called on the owner's thread:
 
-// static
-RenderThread* RenderThread::current() {
-  return lazy_tls_ptr.Pointer()->Get();
-}
-
 RenderThread::RenderThread(const std::wstring& channel_name)
     : Thread("Chrome_RenderThread"),
       channel_name_(channel_name),
@@ -97,7 +89,8 @@ void RenderThread::RemoveRoute(int32 routing_id) {
 }
 
 void RenderThread::Init() {
-  DCHECK(!current()) << "should only have one RenderThread per thread";
+  DCHECK(!g_render_thread);
+  g_render_thread = this;
 
   notification_service_.reset(new NotificationService);
 
@@ -108,8 +101,6 @@ void RenderThread::Init() {
       IPC::Channel::MODE_CLIENT, this, NULL, owner_loop_, true,
       RenderProcess::GetShutDownEvent()));
 
-  lazy_tls_ptr.Pointer()->Set(this);
-
   // The renderer thread should wind-up COM.
   CoInitialize(0);
 
@@ -124,7 +115,8 @@ void RenderThread::Init() {
 }
 
 void RenderThread::CleanUp() {
-  DCHECK(current() == this);
+  DCHECK(g_render_thread == this);
+  g_render_thread = NULL;
 
   // Need to destruct the SyncChannel to the browser before we go away because
   // it caches a pointer to this thread.