Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2238)

Unified Diff: chrome/browser/chromeos/login/kiosk_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
Index: chrome/browser/chromeos/login/kiosk_browsertest.cc
diff --git a/chrome/browser/chromeos/login/kiosk_browsertest.cc b/chrome/browser/chromeos/login/kiosk_browsertest.cc
index fd118815b006a17c0030b155b877e05622d0397e..fd65deba40f9e3bfd9891197374380dcdf7580b8 100644
--- a/chrome/browser/chromeos/login/kiosk_browsertest.cc
+++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc
@@ -249,6 +249,9 @@ class KioskTest : public InProcessBrowserTest {
embedded_test_server()->RegisterRequestHandler(
base::Bind(&FakeGaia::HandleRequest, base::Unretained(&fake_gaia_)));
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+ // Stop IO thread here because no threads are allowed while
+ // spawning sandbox host process. See crbug.com/322732.
+ embedded_test_server()->StopThread();
mock_user_manager_.reset(new MockUserManager);
AppLaunchController::SkipSplashWaitForTesting();
@@ -261,6 +264,11 @@ class KioskTest : public InProcessBrowserTest {
host_resolver()->AddRule("*", "127.0.0.1");
}
+ virtual void SetUpOnMainThread() OVERRIDE {
+ // Restart the thread as the sandbox host process has already been spawned.
+ embedded_test_server()->RestartThreadAndListen();
+ }
+
virtual void CleanUpOnMainThread() OVERRIDE {
// We need to clean up these objects in this specific order.
fake_network_notifier_.reset(NULL);
@@ -801,6 +809,7 @@ class KioskEnterpriseTest : public KioskTest {
}
virtual void SetUpOnMainThread() OVERRIDE {
+ KioskTest::SetUpOnMainThread();
// Configure kTestEnterpriseKioskApp in device policy.
em::DeviceLocalAccountsProto* accounts =
device_policy_test_helper_.device_policy()->payload()
@@ -832,8 +841,6 @@ class KioskEnterpriseTest : public KioskTest {
base::RunLoop().RunUntilIdle();
ASSERT_TRUE(token_service);
token_service->SetAndSaveRefreshToken(kTestRefreshToken);
-
- KioskTest::SetUpOnMainThread();
}
static void StorePolicyCallback(bool result) {
« no previous file with comments | « chrome/browser/chromeos/login/crash_restore_browsertest.cc ('k') | chrome/browser/chromeos/login/screen_locker_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698