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

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

Issue 2522283002: Correct EmbeddedTestServer usage in chromeos tests. (Closed)
Patch Set: Correct EmbeddedTestServer usage in chromeos tests. Created 4 years, 1 month 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 | « no previous file | chrome/browser/chromeos/policy/device_local_account_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 18fec2e48c274a11cafdb0623c9463de42942ca5..e859b0478fd48e268df8a33a6e515c4c7df8f6eb 100644
--- a/chrome/browser/chromeos/login/kiosk_browsertest.cc
+++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc
@@ -2281,12 +2281,12 @@ IN_PROC_BROWSER_TEST_F(KioskEnterpriseTest, PrivateStore) {
const char kPrivateStoreUpdate[] = "/private_store_update";
net::EmbeddedTestServer private_server;
- ASSERT_TRUE(private_server.Start());
// |private_server| serves crx from test data dir.
base::FilePath test_data_dir;
PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
private_server.ServeFilesFromDirectory(test_data_dir);
+ ASSERT_TRUE(private_server.InitializeAndListen());
FakeCWS private_store;
private_store.InitAsPrivateStore(&private_server, kPrivateStoreUpdate);
@@ -2294,6 +2294,8 @@ IN_PROC_BROWSER_TEST_F(KioskEnterpriseTest, PrivateStore) {
std::string(kTestEnterpriseKioskApp) + ".crx",
"1.0.0");
+ private_server.StartAcceptingConnections();
+
// Configure kTestEnterpriseKioskApp in device policy.
ConfigureKioskAppInPolicy(kTestEnterpriseAccountId,
kTestEnterpriseKioskApp,
« no previous file with comments | « no previous file | chrome/browser/chromeos/policy/device_local_account_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698