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

content/renderer/media/audio_renderer_impl_unittest.cc

 // Copyright (c) 2011 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.
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_timeouts.h"
@@ skipping 69 matching lines @@
     // Main parts are inspired by the RenderViewFakeResourcesTest.
     // Note that, the IPC part is not utilized in this test.
     content::GetContentClient()->set_renderer(&mock_content_renderer_client_);
 
     static const char kThreadName[] = "RenderThread";
     channel_.reset(new IPC::Channel(kThreadName,
         IPC::Channel::MODE_SERVER, this));
     ASSERT_TRUE(channel_->Connect());
 
     mock_process_.reset(new MockRenderProcess);
+    // The RenderThreadImpl will register itself as the main thread for the
+    // current process.
     render_thread_ = new RenderThreadImpl(kThreadName);
-    mock_process_->set_main_thread(render_thread_);
 
     // Setup expectations for initialization.
     decoder_ = new media::MockAudioDecoder();
 
     EXPECT_CALL(*decoder_, bits_per_channel())
         .WillRepeatedly(Return(16));
     EXPECT_CALL(*decoder_, channel_layout())
         .WillRepeatedly(Return(CHANNEL_LAYOUT_MONO));
     EXPECT_CALL(*decoder_, samples_per_second())
         .WillRepeatedly(Return(44100));
@@ skipping 76 matching lines @@
   base::Time time_now = base::Time();  // Null time by default.
   renderer_->set_earliest_end_time(time_now);
   renderer_->UpdateEarliestEndTime(renderer_->bytes_per_second(),
                                    base::TimeDelta::FromMilliseconds(100),
                                    time_now);
   int time_delta = (renderer_->earliest_end_time() - time_now).InMilliseconds();
   EXPECT_EQ(1100, time_delta);
   renderer_->Stop(media::NewExpectedClosure());
   WaitForIOThreadCompletion();
 }