Run ContentMain in a browser_test's browser process. This removes duplication of code in the browse…

chrome/browser/chromeos/login/login_browsertest.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.
 
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "chrome/browser/chrome_browser_main.h"
 #include "chrome/browser/chrome_browser_main_extra_parts.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 108 matching lines @@
 };
 
 
 class LoginSigninTest : public InProcessBrowserTest {
  protected:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     command_line->AppendSwitch(chromeos::switches::kLoginManager);
     command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);
   }
 
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+  virtual void SetUpOnMainThread() OVERRIDE {
     content_browser_client_.reset(new TestContentBrowserClient());
     original_content_browser_client_ = content::SetBrowserClientForTesting(
         content_browser_client_.get());
   }
 
-  virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
+  virtual void CleanUpOnMainThread() OVERRIDE {
     content::SetBrowserClientForTesting(original_content_browser_client_);
   }
 
   scoped_ptr<TestContentBrowserClient> content_browser_client_;
   content::ContentBrowserClient* original_content_browser_client_;
 };
 
 // After a chrome crash, the session manager will restart chrome with
 // the -login-user flag indicating that the user is already logged in.
 // This profile should NOT be an OTR profile.
@@ skipping 51 matching lines @@
 
 INSTANTIATE_TEST_CASE_P(LoginUserTestInstantiation,
                         LoginUserTest,
                         testing::Bool());
 
 INSTANTIATE_TEST_CASE_P(LoginGuestTestInstantiation,
                         LoginGuestTest,
                         testing::Bool());
 
 }  // namespace