Change ChildProcess::set_main_thread registration to occur inside the RenderThreadImpl::Init method.

content/browser/renderer_host/render_process_host_impl.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.
 
 // Represents the browser side of the browser <--> renderer communication
 // channel. There will be one RenderProcessHost per renderer process.
 
 #include "content/browser/renderer_host/render_process_host_impl.h"
 
 #if defined(OS_WIN)
@@ skipping 124 matching lines @@
     Stop();
   }
 
  protected:
   virtual void Init() {
 #if defined(OS_WIN)
     CoInitialize(NULL);
 #endif
 
     render_process_ = new RenderProcessImpl();
-    render_process_->set_main_thread(new RenderThreadImpl(channel_id_));
+    // The RenderThreadImpl will register itself as the main thread for the
+    // current process.
+    new RenderThreadImpl(channel_id_);
   }
 
   virtual void CleanUp() {
     delete render_process_;
 
 #if defined(OS_WIN)
     CoUninitialize();
 #endif
     // It's a little lame to manually set this flag.  But the single process
     // RendererThread will receive the WM_QUIT.  We don't need to assert on
@@ skipping 1138 matching lines @@
 void RenderProcessHostImpl::OnRevealFolderInOS(const FilePath& path) {
   // Only honor the request if appropriate persmissions are granted.
   if (ChildProcessSecurityPolicy::GetInstance()->CanReadFile(GetID(), path))
     content::GetContentClient()->browser()->OpenItem(path);
 }
 
 void RenderProcessHostImpl::OnSavedPageAsMHTML(int job_id, int64 data_size) {
   content::GetContentClient()->browser()->GetMHTMLGenerationManager()->
       MHTMLGenerated(job_id, data_size);
 }