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

ash/test/ash_test_base.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/test/ash_test_base.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 30 matching lines @@
 #if defined(OS_WIN)
 #include "ash/test/test_metro_viewer_process_host.h"
 #include "base/test/test_process_killer_win.h"
 #include "base/win/metro.h"
 #include "base/win/windows_version.h"
 #include "ui/aura/remote_window_tree_host_win.h"
 #include "ui/aura/window_tree_host_win.h"
 #include "win8/test/test_registrar_constants.h"
 #endif
 
+#if defined(USE_X11)
+#include <X11/Xlib.h>
+#endif
+
 namespace ash {
 namespace test {
 namespace {
 
 class AshEventGeneratorDelegate : public aura::test::EventGeneratorDelegate {
  public:
   AshEventGeneratorDelegate() {}
   virtual ~AshEventGeneratorDelegate() {}
 
   // aura::test::EventGeneratorDelegate overrides:
@@ skipping 22 matching lines @@
   return content::WebContentsTester::CreateTestWebContents(browser_context,
                                                            site_instance);
 }
 
 /////////////////////////////////////////////////////////////////////////////
 
 AshTestBase::AshTestBase()
     : setup_called_(false),
       teardown_called_(false),
       start_session_(true) {
+#if defined(USE_X11)
+  // This is needed for tests which use this base class but are run in browser
+  // test binaries so don't get the default initialization in the unit test
+  // suite.
+  XInitThreads();
+#endif
+
+  thread_bundle_.reset(new content::TestBrowserThreadBundle);
   // Must initialize |ash_test_helper_| here because some tests rely on
   // AshTestBase methods before they call AshTestBase::SetUp().
   ash_test_helper_.reset(new AshTestHelper(base::MessageLoopForUI::current()));
 }
 
 AshTestBase::~AshTestBase() {
   CHECK(setup_called_)
       << "You have overridden SetUp but never called AshTestBase::SetUp";
   CHECK(teardown_called_)
       << "You have overridden TearDown but never called AshTestBase::TearDown";
@@ skipping 237 matching lines @@
 
 void AshTestBase::UnblockUserSession() {
   Shell::GetInstance()->session_state_delegate()->UnlockScreen();
   SetSessionStarted(true);
   SetUserAddingScreenRunning(false);
 }
 
 
 }  // namespace test
 }  // namespace ash