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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1095843003: [cros] Modify oobe/login tests to work with webview (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review Created 5 years, 8 months 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/easy_unlock/bootstrap_browsertest.cc ('k') | chrome/browser/chromeos/login/login_manager_test.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 b4f1aa88758565f21bee5674174ee4fb411433a3..b583daf058d96750920cbb7594116561a9371fee 100644
--- a/chrome/browser/chromeos/login/kiosk_browsertest.cc
+++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc
@@ -474,10 +474,14 @@ void CrosSettingsPermanentlyUntrustedMaker::CheckIfUntrusted() {
} // namespace
-class KioskTest : public OobeBaseTest {
+// Boolean parameter is used to run this test for webview (true) and for
+// iframe (false) GAIA sign in.
+class KioskTest : public OobeBaseTest,
+ public testing::WithParamInterface<bool> {
public:
KioskTest() : use_consumer_kiosk_mode_(true),
fake_cws_(new FakeCWS) {
+ set_use_webview(GetParam());
set_exit_when_last_browser_closes(false);
}
@@ -811,7 +815,7 @@ class KioskTest : public OobeBaseTest {
DISALLOW_COPY_AND_ASSIGN(KioskTest);
};
-IN_PROC_BROWSER_TEST_F(KioskTest, InstallAndLaunchApp) {
+IN_PROC_BROWSER_TEST_P(KioskTest, InstallAndLaunchApp) {
StartAppLaunchFromLoginScreen(SimulateNetworkOnlineClosure());
WaitForAppLaunchSuccess();
KioskAppManager::App app;
@@ -819,7 +823,7 @@ IN_PROC_BROWSER_TEST_F(KioskTest, InstallAndLaunchApp) {
EXPECT_FALSE(app.was_auto_launched_with_zero_delay);
}
-IN_PROC_BROWSER_TEST_F(KioskTest, ZoomSupport) {
+IN_PROC_BROWSER_TEST_P(KioskTest, ZoomSupport) {
ExtensionTestMessageListener
app_window_loaded_listener("appWindowLoaded", false);
StartAppLaunchFromLoginScreen(SimulateNetworkOnlineClosure());
@@ -886,7 +890,7 @@ IN_PROC_BROWSER_TEST_F(KioskTest, ZoomSupport) {
content::RunAllPendingInMessageLoop();
}
-IN_PROC_BROWSER_TEST_F(KioskTest, NotSignedInWithGAIAAccount) {
+IN_PROC_BROWSER_TEST_P(KioskTest, NotSignedInWithGAIAAccount) {
// Tests that the kiosk session is not considered to be logged in with a GAIA
// account.
StartAppLaunchFromLoginScreen(SimulateNetworkOnlineClosure());
@@ -898,18 +902,18 @@ IN_PROC_BROWSER_TEST_F(KioskTest, NotSignedInWithGAIAAccount) {
SigninManagerFactory::GetForProfile(app_profile)->IsAuthenticated());
}
-IN_PROC_BROWSER_TEST_F(KioskTest, PRE_LaunchAppNetworkDown) {
+IN_PROC_BROWSER_TEST_P(KioskTest, PRE_LaunchAppNetworkDown) {
// Tests the network down case for the initial app download and launch.
RunAppLaunchNetworkDownTest();
}
-IN_PROC_BROWSER_TEST_F(KioskTest, LaunchAppNetworkDown) {
+IN_PROC_BROWSER_TEST_P(KioskTest, LaunchAppNetworkDown) {
// Tests the network down case for launching an existing app that is
// installed in PRE_LaunchAppNetworkDown.
RunAppLaunchNetworkDownTest();
}
-IN_PROC_BROWSER_TEST_F(KioskTest, LaunchAppWithNetworkConfigAccelerator) {
+IN_PROC_BROWSER_TEST_P(KioskTest, LaunchAppWithNetworkConfigAccelerator) {
ScopedCanConfigureNetwork can_configure_network(true, false);
// Block app loading until the network screen is shown.
@@ -946,7 +950,7 @@ IN_PROC_BROWSER_TEST_F(KioskTest, LaunchAppWithNetworkConfigAccelerator) {
WaitForAppLaunchSuccess();
}
-IN_PROC_BROWSER_TEST_F(KioskTest, LaunchAppNetworkDownConfigureNotAllowed) {
+IN_PROC_BROWSER_TEST_P(KioskTest, LaunchAppNetworkDownConfigureNotAllowed) {
// Mock network could not be configured.
ScopedCanConfigureNetwork can_configure_network(false, true);
@@ -964,7 +968,7 @@ IN_PROC_BROWSER_TEST_F(KioskTest, LaunchAppNetworkDownConfigureNotAllowed) {
WaitForAppLaunchSuccess();
}
-IN_PROC_BROWSER_TEST_F(KioskTest, LaunchAppNetworkPortal) {
+IN_PROC_BROWSER_TEST_P(KioskTest, LaunchAppNetworkPortal) {
// Mock network could be configured without the owner password.
ScopedCanConfigureNetwork can_configure_network(true, false);
@@ -983,7 +987,7 @@ IN_PROC_BROWSER_TEST_F(KioskTest, LaunchAppNetworkPortal) {
WaitForAppLaunchSuccess();
}
-IN_PROC_BROWSER_TEST_F(KioskTest, LaunchAppUserCancel) {
+IN_PROC_BROWSER_TEST_P(KioskTest, LaunchAppUserCancel) {
// Make fake_cws_ return empty update response.
set_test_app_version("");
StartAppLaunchFromLoginScreen(SimulateNetworkOfflineClosure());
@@ -1002,7 +1006,7 @@ IN_PROC_BROWSER_TEST_F(KioskTest, LaunchAppUserCancel) {
chromeos::KioskAppLaunchError::Get());
}
-IN_PROC_BROWSER_TEST_F(KioskTest, LaunchInDiagnosticMode) {
+IN_PROC_BROWSER_TEST_P(KioskTest, LaunchInDiagnosticMode) {
PrepareAppLaunch();
SimulateNetworkOnline();
@@ -1027,7 +1031,7 @@ IN_PROC_BROWSER_TEST_F(KioskTest, LaunchInDiagnosticMode) {
WaitForAppLaunchSuccess();
}
-IN_PROC_BROWSER_TEST_F(KioskTest, AutolaunchWarningCancel) {
+IN_PROC_BROWSER_TEST_P(KioskTest, AutolaunchWarningCancel) {
EnableConsumerKioskMode();
chromeos::WizardController::SkipPostLoginScreensForTesting();
@@ -1059,7 +1063,7 @@ IN_PROC_BROWSER_TEST_F(KioskTest, AutolaunchWarningCancel) {
EXPECT_FALSE(KioskAppManager::Get()->IsAutoLaunchEnabled());
}
-IN_PROC_BROWSER_TEST_F(KioskTest, AutolaunchWarningConfirm) {
+IN_PROC_BROWSER_TEST_P(KioskTest, AutolaunchWarningConfirm) {
EnableConsumerKioskMode();
chromeos::WizardController::SkipPostLoginScreensForTesting();
@@ -1098,7 +1102,7 @@ IN_PROC_BROWSER_TEST_F(KioskTest, AutolaunchWarningConfirm) {
EXPECT_TRUE(app.was_auto_launched_with_zero_delay);
}
-IN_PROC_BROWSER_TEST_F(KioskTest, KioskEnableCancel) {
+IN_PROC_BROWSER_TEST_P(KioskTest, KioskEnableCancel) {
chromeos::WizardController::SkipPostLoginScreensForTesting();
chromeos::WizardController* wizard_controller =
chromeos::WizardController::default_controller();
@@ -1132,7 +1136,7 @@ IN_PROC_BROWSER_TEST_F(KioskTest, KioskEnableCancel) {
GetConsumerKioskModeStatus());
}
-IN_PROC_BROWSER_TEST_F(KioskTest, KioskEnableConfirmed) {
+IN_PROC_BROWSER_TEST_P(KioskTest, KioskEnableConfirmed) {
// Start UI, find menu entry for this app and launch it.
chromeos::WizardController::SkipPostLoginScreensForTesting();
chromeos::WizardController* wizard_controller =
@@ -1165,7 +1169,7 @@ IN_PROC_BROWSER_TEST_F(KioskTest, KioskEnableConfirmed) {
GetConsumerKioskModeStatus());
}
-IN_PROC_BROWSER_TEST_F(KioskTest, KioskEnableAfter2ndSigninScreen) {
+IN_PROC_BROWSER_TEST_P(KioskTest, KioskEnableAfter2ndSigninScreen) {
chromeos::WizardController::SkipPostLoginScreensForTesting();
chromeos::WizardController* wizard_controller =
chromeos::WizardController::default_controller();
@@ -1209,7 +1213,7 @@ IN_PROC_BROWSER_TEST_F(KioskTest, KioskEnableAfter2ndSigninScreen) {
content::NotificationService::AllSources()).Wait();
}
-IN_PROC_BROWSER_TEST_F(KioskTest, DoNotLaunchWhenUntrusted) {
+IN_PROC_BROWSER_TEST_P(KioskTest, DoNotLaunchWhenUntrusted) {
PrepareAppLaunch();
SimulateNetworkOnline();
@@ -1234,7 +1238,7 @@ IN_PROC_BROWSER_TEST_F(KioskTest, DoNotLaunchWhenUntrusted) {
// Verifies that a consumer device does not auto-launch kiosk mode when cros
// settings are untrusted.
-IN_PROC_BROWSER_TEST_F(KioskTest, NoConsumerAutoLaunchWhenUntrusted) {
+IN_PROC_BROWSER_TEST_P(KioskTest, NoConsumerAutoLaunchWhenUntrusted) {
EnableConsumerKioskMode();
// Wait for and confirm the auto-launch warning.
@@ -1260,7 +1264,7 @@ IN_PROC_BROWSER_TEST_F(KioskTest, NoConsumerAutoLaunchWhenUntrusted) {
}
// Verifies available volumes for kiosk apps in kiosk session.
-IN_PROC_BROWSER_TEST_F(KioskTest, GetVolumeList) {
+IN_PROC_BROWSER_TEST_P(KioskTest, GetVolumeList) {
set_test_app_id(kTestGetVolumeListKioskApp);
set_test_app_version("0.1");
set_test_crx_file(test_app_id() + ".crx");
@@ -1272,7 +1276,7 @@ IN_PROC_BROWSER_TEST_F(KioskTest, GetVolumeList) {
// Verifies that an enterprise device does not auto-launch kiosk mode when cros
// settings are untrusted.
-IN_PROC_BROWSER_TEST_F(KioskTest, NoEnterpriseAutoLaunchWhenUntrusted) {
+IN_PROC_BROWSER_TEST_P(KioskTest, NoEnterpriseAutoLaunchWhenUntrusted) {
PrepareAppLaunch();
SimulateNetworkOnline();
@@ -1437,13 +1441,13 @@ class KioskUpdateTest : public KioskTest {
DISALLOW_COPY_AND_ASSIGN(KioskUpdateTest);
};
-IN_PROC_BROWSER_TEST_F(KioskUpdateTest, PRE_LaunchOfflineEnabledAppNoNetwork) {
+IN_PROC_BROWSER_TEST_P(KioskUpdateTest, PRE_LaunchOfflineEnabledAppNoNetwork) {
PreCacheAndLaunchApp(kTestOfflineEnabledKioskApp,
"1.0.0",
std::string(kTestOfflineEnabledKioskApp) + "_v1.crx");
}
-IN_PROC_BROWSER_TEST_F(KioskUpdateTest, LaunchOfflineEnabledAppNoNetwork) {
+IN_PROC_BROWSER_TEST_P(KioskUpdateTest, LaunchOfflineEnabledAppNoNetwork) {
set_test_app_id(kTestOfflineEnabledKioskApp);
StartUIForAppLaunch();
SimulateNetworkOffline();
@@ -1453,14 +1457,14 @@ IN_PROC_BROWSER_TEST_F(KioskUpdateTest, LaunchOfflineEnabledAppNoNetwork) {
EXPECT_EQ("1.0.0", GetInstalledAppVersion().GetString());
}
-IN_PROC_BROWSER_TEST_F(KioskUpdateTest,
+IN_PROC_BROWSER_TEST_P(KioskUpdateTest,
PRE_LaunchCachedOfflineEnabledAppNoNetwork) {
PreCacheApp(kTestOfflineEnabledKioskApp,
"1.0.0",
std::string(kTestOfflineEnabledKioskApp) + "_v1.crx");
}
-IN_PROC_BROWSER_TEST_F(KioskUpdateTest,
+IN_PROC_BROWSER_TEST_P(KioskUpdateTest,
LaunchCachedOfflineEnabledAppNoNetwork) {
set_test_app_id(kTestOfflineEnabledKioskApp);
EXPECT_TRUE(
@@ -1475,7 +1479,7 @@ IN_PROC_BROWSER_TEST_F(KioskUpdateTest,
// Network offline, app v1.0 has run before, has cached v2.0 crx and v2.0 should
// be installed and launched during next launch.
-IN_PROC_BROWSER_TEST_F(KioskUpdateTest,
+IN_PROC_BROWSER_TEST_P(KioskUpdateTest,
PRE_LaunchCachedNewVersionOfflineEnabledAppNoNetwork) {
// Install and launch v1 app.
PreCacheAndLaunchApp(kTestOfflineEnabledKioskApp,
@@ -1488,7 +1492,7 @@ IN_PROC_BROWSER_TEST_F(KioskUpdateTest,
EXPECT_EQ("1.0.0", GetInstalledAppVersion().GetString());
}
-IN_PROC_BROWSER_TEST_F(KioskUpdateTest,
+IN_PROC_BROWSER_TEST_P(KioskUpdateTest,
LaunchCachedNewVersionOfflineEnabledAppNoNetwork) {
set_test_app_id(kTestOfflineEnabledKioskApp);
EXPECT_TRUE(KioskAppManager::Get()->HasCachedCrx(test_app_id()));
@@ -1502,13 +1506,13 @@ IN_PROC_BROWSER_TEST_F(KioskUpdateTest,
EXPECT_EQ("2.0.0", GetInstalledAppVersion().GetString());
}
-IN_PROC_BROWSER_TEST_F(KioskUpdateTest, PRE_LaunchOfflineEnabledAppNoUpdate) {
+IN_PROC_BROWSER_TEST_P(KioskUpdateTest, PRE_LaunchOfflineEnabledAppNoUpdate) {
PreCacheAndLaunchApp(kTestOfflineEnabledKioskApp,
"1.0.0",
std::string(kTestOfflineEnabledKioskApp) + "_v1.crx");
}
-IN_PROC_BROWSER_TEST_F(KioskUpdateTest, LaunchOfflineEnabledAppNoUpdate) {
+IN_PROC_BROWSER_TEST_P(KioskUpdateTest, LaunchOfflineEnabledAppNoUpdate) {
set_test_app_id(kTestOfflineEnabledKioskApp);
fake_cws()->SetNoUpdate(test_app_id());
@@ -1520,13 +1524,13 @@ IN_PROC_BROWSER_TEST_F(KioskUpdateTest, LaunchOfflineEnabledAppNoUpdate) {
EXPECT_EQ("1.0.0", GetInstalledAppVersion().GetString());
}
-IN_PROC_BROWSER_TEST_F(KioskUpdateTest, PRE_LaunchOfflineEnabledAppHasUpdate) {
+IN_PROC_BROWSER_TEST_P(KioskUpdateTest, PRE_LaunchOfflineEnabledAppHasUpdate) {
PreCacheAndLaunchApp(kTestOfflineEnabledKioskApp,
"1.0.0",
std::string(kTestOfflineEnabledKioskApp) + "_v1.crx");
}
-IN_PROC_BROWSER_TEST_F(KioskUpdateTest, LaunchOfflineEnabledAppHasUpdate) {
+IN_PROC_BROWSER_TEST_P(KioskUpdateTest, LaunchOfflineEnabledAppHasUpdate) {
set_test_app_id(kTestOfflineEnabledKioskApp);
fake_cws()->SetUpdateCrx(
test_app_id(), "ajoggoflpgplnnjkjamcmbepjdjdnpdp.crx", "2.0.0");
@@ -1541,7 +1545,7 @@ IN_PROC_BROWSER_TEST_F(KioskUpdateTest, LaunchOfflineEnabledAppHasUpdate) {
// Pre-cache v1 kiosk app, then launch the app without network,
// plug in usb stick with a v2 app for offline updating.
-IN_PROC_BROWSER_TEST_F(KioskUpdateTest, PRE_UsbStickUpdateAppNoNetwork) {
+IN_PROC_BROWSER_TEST_P(KioskUpdateTest, PRE_UsbStickUpdateAppNoNetwork) {
PreCacheApp(kTestOfflineEnabledKioskApp,
"1.0.0",
std::string(kTestOfflineEnabledKioskApp) + "_v1.crx");
@@ -1572,7 +1576,7 @@ IN_PROC_BROWSER_TEST_F(KioskUpdateTest, PRE_UsbStickUpdateAppNoNetwork) {
}
// Restart the device, verify the app has been updated to v2.
-IN_PROC_BROWSER_TEST_F(KioskUpdateTest, UsbStickUpdateAppNoNetwork) {
+IN_PROC_BROWSER_TEST_P(KioskUpdateTest, UsbStickUpdateAppNoNetwork) {
// Verify the kiosk app has been updated to v2.
set_test_app_id(kTestOfflineEnabledKioskApp);
StartUIForAppLaunch();
@@ -1583,7 +1587,7 @@ IN_PROC_BROWSER_TEST_F(KioskUpdateTest, UsbStickUpdateAppNoNetwork) {
}
// Usb stick is plugged in without a manifest file on it.
-IN_PROC_BROWSER_TEST_F(KioskUpdateTest, UsbStickUpdateAppNoManifest) {
+IN_PROC_BROWSER_TEST_P(KioskUpdateTest, UsbStickUpdateAppNoManifest) {
PreCacheAndLaunchApp(kTestOfflineEnabledKioskApp,
"1.0.0",
std::string(kTestOfflineEnabledKioskApp) + "_v1.crx");
@@ -1605,7 +1609,7 @@ IN_PROC_BROWSER_TEST_F(KioskUpdateTest, UsbStickUpdateAppNoManifest) {
}
// Usb stick is plugged in with a bad manifest file on it.
-IN_PROC_BROWSER_TEST_F(KioskUpdateTest, UsbStickUpdateAppBadManifest) {
+IN_PROC_BROWSER_TEST_P(KioskUpdateTest, UsbStickUpdateAppBadManifest) {
PreCacheAndLaunchApp(kTestOfflineEnabledKioskApp,
"1.0.0",
std::string(kTestOfflineEnabledKioskApp) + "_v1.crx");
@@ -1628,7 +1632,7 @@ IN_PROC_BROWSER_TEST_F(KioskUpdateTest, UsbStickUpdateAppBadManifest) {
// Usb stick is plugged in with a lower version of crx file specified in
// manifest.
-IN_PROC_BROWSER_TEST_F(KioskUpdateTest, UsbStickUpdateAppLowerAppVersion) {
+IN_PROC_BROWSER_TEST_P(KioskUpdateTest, UsbStickUpdateAppLowerAppVersion) {
// Precache v2 version of app.
PreCacheAndLaunchApp(kTestOfflineEnabledKioskApp,
"2.0.0",
@@ -1652,7 +1656,7 @@ IN_PROC_BROWSER_TEST_F(KioskUpdateTest, UsbStickUpdateAppLowerAppVersion) {
// Usb stick is plugged in with a v1 crx file, although the manifest says
// this is a v3 version.
-IN_PROC_BROWSER_TEST_F(KioskUpdateTest, UsbStickUpdateAppLowerCrxVersion) {
+IN_PROC_BROWSER_TEST_P(KioskUpdateTest, UsbStickUpdateAppLowerCrxVersion) {
PreCacheAndLaunchApp(kTestOfflineEnabledKioskApp,
"2.0.0",
std::string(kTestOfflineEnabledKioskApp) + ".crx");
@@ -1675,7 +1679,7 @@ IN_PROC_BROWSER_TEST_F(KioskUpdateTest, UsbStickUpdateAppLowerCrxVersion) {
}
// Usb stick is plugged in with a bad crx file.
-IN_PROC_BROWSER_TEST_F(KioskUpdateTest, UsbStickUpdateAppBadCrx) {
+IN_PROC_BROWSER_TEST_P(KioskUpdateTest, UsbStickUpdateAppBadCrx) {
PreCacheAndLaunchApp(kTestOfflineEnabledKioskApp,
"1.0.0",
std::string(kTestOfflineEnabledKioskApp) + "_v1.crx");
@@ -1697,13 +1701,13 @@ IN_PROC_BROWSER_TEST_F(KioskUpdateTest, UsbStickUpdateAppBadCrx) {
EXPECT_EQ("1.0.0", cached_version);
}
-IN_PROC_BROWSER_TEST_F(KioskUpdateTest, PRE_PermissionChange) {
+IN_PROC_BROWSER_TEST_P(KioskUpdateTest, PRE_PermissionChange) {
PreCacheAndLaunchApp(kTestOfflineEnabledKioskApp,
"2.0.0",
std::string(kTestOfflineEnabledKioskApp) + ".crx");
}
-IN_PROC_BROWSER_TEST_F(KioskUpdateTest, PermissionChange) {
+IN_PROC_BROWSER_TEST_P(KioskUpdateTest, PermissionChange) {
set_test_app_id(kTestOfflineEnabledKioskApp);
set_test_app_version("2.0.0");
set_test_crx_file(test_app_id() + "_v2_permission_change.crx");
@@ -1716,7 +1720,7 @@ IN_PROC_BROWSER_TEST_F(KioskUpdateTest, PermissionChange) {
EXPECT_EQ("2.0.0", GetInstalledAppVersion().GetString());
}
-IN_PROC_BROWSER_TEST_F(KioskUpdateTest, PRE_PreserveLocalData) {
+IN_PROC_BROWSER_TEST_P(KioskUpdateTest, PRE_PreserveLocalData) {
// Installs v1 app and writes some local data.
set_test_app_id(kTestLocalFsKioskApp);
set_test_app_version("1.0.0");
@@ -1729,7 +1733,7 @@ IN_PROC_BROWSER_TEST_F(KioskUpdateTest, PRE_PreserveLocalData) {
ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
}
-IN_PROC_BROWSER_TEST_F(KioskUpdateTest, PreserveLocalData) {
+IN_PROC_BROWSER_TEST_P(KioskUpdateTest, PreserveLocalData) {
// Update existing v1 app installed in PRE_PreserveLocalData to v2
// that reads and verifies the local data.
set_test_app_id(kTestLocalFsKioskApp);
@@ -1835,7 +1839,7 @@ class KioskEnterpriseTest : public KioskTest {
DISALLOW_COPY_AND_ASSIGN(KioskEnterpriseTest);
};
-IN_PROC_BROWSER_TEST_F(KioskEnterpriseTest, EnterpriseKioskApp) {
+IN_PROC_BROWSER_TEST_P(KioskEnterpriseTest, EnterpriseKioskApp) {
// Prepare Fake CWS to serve app crx.
set_test_app_id(kTestEnterpriseKioskApp);
set_test_app_version("1.0.0");
@@ -1890,7 +1894,7 @@ IN_PROC_BROWSER_TEST_F(KioskEnterpriseTest, EnterpriseKioskApp) {
content::RunAllPendingInMessageLoop();
}
-IN_PROC_BROWSER_TEST_F(KioskEnterpriseTest, PrivateStore) {
+IN_PROC_BROWSER_TEST_P(KioskEnterpriseTest, PrivateStore) {
set_test_app_id(kTestEnterpriseKioskApp);
const char kPrivateStoreUpdate[] = "/private_store_update";
@@ -1975,7 +1979,7 @@ class KioskHiddenWebUITest : public KioskTest,
DISALLOW_COPY_AND_ASSIGN(KioskHiddenWebUITest);
};
-IN_PROC_BROWSER_TEST_F(KioskHiddenWebUITest, AutolaunchWarning) {
+IN_PROC_BROWSER_TEST_P(KioskHiddenWebUITest, AutolaunchWarning) {
// Add a device owner.
FakeChromeUserManager* user_manager = new FakeChromeUserManager();
user_manager->AddUser(kTestOwnerEmail);
@@ -2006,4 +2010,13 @@ IN_PROC_BROWSER_TEST_F(KioskHiddenWebUITest, AutolaunchWarning) {
EXPECT_TRUE(wallpaper_loaded());
}
+INSTANTIATE_TEST_CASE_P(KioskSuite, KioskTest, testing::Bool());
+INSTANTIATE_TEST_CASE_P(KioskUpdateSuite, KioskUpdateTest, testing::Bool());
+INSTANTIATE_TEST_CASE_P(KioskEnterpriseSuite,
+ KioskEnterpriseTest,
+ testing::Bool());
+INSTANTIATE_TEST_CASE_P(KioskHiddenWebUISuite,
+ KioskHiddenWebUITest,
+ testing::Bool());
+
} // namespace chromeos
« no previous file with comments | « chrome/browser/chromeos/login/easy_unlock/bootstrap_browsertest.cc ('k') | chrome/browser/chromeos/login/login_manager_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698