1 files changed, 9 insertions, 8 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index d87b327..9528187 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -1461,8 +1461,8 @@ void RenderView::DidFinishDocumentLoadForFrame(WebView* webview,
   // Check whether we have new encoding name.
   UpdateEncoding(frame, webview->GetMainFrameEncodingName());
 
-  if (RenderThread::current())  // Will be NULL during unit tests.
-    RenderThread::current()->user_script_slave()->InjectScripts(
+  if (g_render_thread)  // Will be NULL during unit tests.
+    g_render_thread->user_script_slave()->InjectScripts(
         frame, UserScript::DOCUMENT_END);
 }
 
@@ -1532,8 +1532,8 @@ void RenderView::WindowObjectCleared(WebFrame* webframe) {
 }
 
 void RenderView::DocumentElementAvailable(WebFrame* frame) {
-  if (RenderThread::current())  // Will be NULL during unit tests.
-    RenderThread::current()->user_script_slave()->InjectScripts(
+  if (g_render_thread)  // Will be NULL during unit tests.
+    g_render_thread->user_script_slave()->InjectScripts(
         frame, UserScript::DOCUMENT_START);
 }
 
@@ -1863,12 +1863,13 @@ WebWidget* RenderView::CreatePopupWidget(WebView* webview,
 
 static bool ShouldLoadPluginInProcess(const std::string& mime_type,
                                       bool* is_gears) {
-  if (RenderProcess::current()->in_process_plugins())
+  if (RenderProcess::ShouldLoadPluginsInProcess())
     return true;
 
   if (mime_type == "application/x-googlegears") {
     *is_gears = true;
-    return RenderProcess::current()->in_process_gears();
+    return CommandLine::ForCurrentProcess()->HasSwitch(
+        switches::kGearsInRenderer);
   }
 
   return false;
@@ -2865,8 +2866,8 @@ std::string RenderView::GetAltHTMLForTemplate(
 MessageLoop* RenderView::GetMessageLoopForIO() {
   // Assume that we have only one RenderThread in the process and the owner loop
   // of RenderThread is an IO message loop.
-  if (RenderThread::current())
-    return RenderThread::current()->owner_loop();
+  if (g_render_thread)
+    return g_render_thread->owner_loop();
   return NULL;
 }