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..a4a99009d7d77c667048348ea933fae562fabecd 100644 |
--- a/chrome/browser/chromeos/login/kiosk_browsertest.cc |
+++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc |
@@ -249,6 +249,7 @@ class KioskTest : public InProcessBrowserTest { |
embedded_test_server()->RegisterRequestHandler( |
base::Bind(&FakeGaia::HandleRequest, base::Unretained(&fake_gaia_))); |
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); |
+ embedded_test_server()->StopThread(); |
satorux1
2013/11/26 01:22:58
this is not obvious. could you add some comment ab
oshima
2013/11/26 02:18:43
I added comment.
|
mock_user_manager_.reset(new MockUserManager); |
AppLaunchController::SkipSplashWaitForTesting(); |
@@ -261,6 +262,10 @@ class KioskTest : public InProcessBrowserTest { |
host_resolver()->AddRule("*", "127.0.0.1"); |
} |
+ virtual void SetUpOnMainThread() OVERRIDE { |
+ embedded_test_server()->StartThread(); |
+ } |
+ |
virtual void CleanUpOnMainThread() OVERRIDE { |
// We need to clean up these objects in this specific order. |
fake_network_notifier_.reset(NULL); |