Do not spawn a thread in browser/interactive ui tests before spawning sandbox host process

chrome/browser/apps/app_browsertest.cc

 // Copyright 2013 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 "apps/launcher.h"
 #include "apps/shell_window.h"
 #include "apps/shell_window_registry.h"
 #include "apps/ui/native_app_window.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 1233 matching lines @@
   // PlatformAppBrowserTest overrides
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     PlatformAppBrowserTest::SetUpInProcessBrowserTestFixture();
 
     chromeos::FakeDBusThreadManager* dbus_manager =
         new chromeos::FakeDBusThreadManager;
     dbus_manager->SetFakeClients();
     power_manager_client_ = new chromeos::FakePowerManagerClient;
     dbus_manager->SetPowerManagerClient(
         scoped_ptr<chromeos::PowerManagerClient>(power_manager_client_));
-    chromeos::DBusThreadManager::InitializeForTesting(dbus_manager);
+    chromeos::DBusThreadManager::SetInstanceForTesting(dbus_manager);
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
     PlatformAppBrowserTest::SetUpOnMainThread();
 
     mock_user_manager_ = new chromeos::MockUserManager;
     user_manager_enabler_.reset(
         new chromeos::ScopedUserManagerEnabler(mock_user_manager_));
 
     EXPECT_CALL(*mock_user_manager_, IsUserLoggedIn())
         .WillRepeatedly(testing::Return(true));
     EXPECT_CALL(*mock_user_manager_, IsLoggedInAsKioskApp())
         .WillRepeatedly(testing::Return(true));
   }
 
   virtual void CleanUpOnMainThread() OVERRIDE {
     user_manager_enabler_.reset();
     PlatformAppBrowserTest::CleanUpOnMainThread();
   }
 
   virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
-    chromeos::DBusThreadManager::Shutdown();

[satorux1, 2013/11/27 03:27:17]

Is it ok to remove this? I thought FakeDBusThreadManager was deleted by
Shutdown()

[oshima, 2013/11/27 07:41:54]

Yes, this wasn't necessary because Shutdown is called in regular shutdown
process. (Browser tests launches and shutdown browser, which calls Initialize
and Shutdown)

     PlatformAppBrowserTest::TearDownInProcessBrowserTestFixture();
   }
 
   int request_restart_call_count() const {
     return power_manager_client_->request_restart_call_count();
   }
 
  private:
   chromeos::FakePowerManagerClient* power_manager_client_;
   chromeos::MockUserManager* mock_user_manager_;
@@ skipping 17 matching lines @@
                                                           false);
   ASSERT_TRUE(restart_requested_listener.WaitUntilSatisfied());
 
   EXPECT_EQ(1, request_restart_call_count());
 }
 
 #endif  // defined(OS_CHROMEOS)
 
 
 }  // namespace extensions