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

ash/test/ash_test_base.h

 // 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.
 
 #ifndef ASH_TEST_ASH_TEST_BASE_H_
 #define ASH_TEST_ASH_TEST_BASE_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 121 matching lines @@
   // Methods to emulate blocking and unblocking user session with given
   // |block_reason|.
   void BlockUserSession(UserSessionBlockReason block_reason);
   void UnblockUserSession();
 
  private:
   bool setup_called_;
   bool teardown_called_;
   // |SetUp()| doesn't activate session if this is set to false.
   bool start_session_;
-  content::TestBrowserThreadBundle thread_bundle_;
+  scoped_ptr<content::TestBrowserThreadBundle> thread_bundle_;
   scoped_ptr<AshTestHelper> ash_test_helper_;
   scoped_ptr<aura::test::EventGenerator> event_generator_;
 #if defined(OS_WIN)
   // Note that the order is important here as ipc_thread_ should be destroyed
   // after metro_viewer_host_->channel_.
   scoped_ptr<base::Thread> ipc_thread_;
   scoped_ptr<TestMetroViewerProcessHost> metro_viewer_host_;
   ui::ScopedOleInitializer ole_initializer_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(AshTestBase);
 };
 
 class NoSessionAshTestBase : public AshTestBase {
  public:
   NoSessionAshTestBase() {
     set_start_session(false);
   }
   virtual ~NoSessionAshTestBase() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NoSessionAshTestBase);
 };
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_TEST_ASH_TEST_BASE_H_