chrome/browser/chromeos/login/wizard_controller_browsertest.cc - Issue 83633004: Do not spawn a thread in browser/interactive ui tests before spawning sandbox host process

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/wizard_controller_browsertest.cc

Issue 83633004: Do not spawn a thread in browser/interactive ui tests before spawning sandbox host process (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: style fix Created 7 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/login/screens/update_screen_browsertest.cc ('k') | chrome/browser/chromeos/policy/device_local_account_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/wizard_controller_browsertest.cc

diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc

index c20afe2af07c03b823a24caffb2c14be037000e4..6df05204b1cde241fa6ca55167d80ad2761e492a 100644

--- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc

+++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc

@@ -454,7 +454,7 @@ class WizardControllerBrokenLocalStateTest : public WizardControllerTest {

fake_session_manager_client_ = new FakeSessionManagerClient;

fake_dbus_thread_manager->SetSessionManagerClient(

scoped_ptr<SessionManagerClient>(fake_session_manager_client_));

- DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager);

+ DBusThreadManager::SetInstanceForTesting(fake_dbus_thread_manager);

}

virtual void SetUpOnMainThread() OVERRIDE {

@@ -471,7 +471,6 @@ class WizardControllerBrokenLocalStateTest : public WizardControllerTest {

virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {

WizardControllerTest::TearDownInProcessBrowserTestFixture();

- DBusThreadManager::Shutdown();

}

ErrorScreen* GetErrorScreen() {