[cros] Modify oobe/login tests to work with webview

chrome/browser/chromeos/login/easy_unlock/bootstrap_browsertest.cc

Index: chrome/browser/chromeos/login/easy_unlock/bootstrap_browsertest.cc
diff --git a/chrome/browser/chromeos/login/easy_unlock/bootstrap_browsertest.cc b/chrome/browser/chromeos/login/easy_unlock/bootstrap_browsertest.cc
index e41275f0a6ccdd40f35d8913057aa00a76345694..f0e4be2be38d5272cce7d70d3881419308d39f8d 100644
--- a/chrome/browser/chromeos/login/easy_unlock/bootstrap_browsertest.cc
+++ b/chrome/browser/chromeos/login/easy_unlock/bootstrap_browsertest.cc
@@ -57,8 +57,16 @@ ScopedCompleteCallbackForTesting::~ScopedCompleteCallbackForTesting() {
 
 }  // namespace
 
-class BootstrapTest : public OobeBaseTest {
+// Boolean parameter is used to run this test for webview (true) and for
+// iframe (false) GAIA sign in.
+class BootstrapTest : public OobeBaseTest,
+                      public testing::WithParamInterface<bool> {
  public:
+  BootstrapTest() {
+    // TODO(nkostylev): Fix this test for webview. http://crbug.com/477402
+    set_use_webview(false);

[Dmitry Polukhin, 2015/04/22 06:47:07]

nit, you can make it initialize it with GetParam() but in set of test add only
'false'.

[Nikita (slow), 2015/04/22 09:01:44]

Done.

+  }
+
   void SetUpCommandLine(base::CommandLine* command_line) override {
     OobeBaseTest::SetUpCommandLine(command_line);
 
@@ -129,7 +137,7 @@ class BootstrapTest : public OobeBaseTest {
   }
 };
 
-IN_PROC_BROWSER_TEST_F(BootstrapTest, Basic) {
+IN_PROC_BROWSER_TEST_P(BootstrapTest, Basic) {
   ScopedCompleteCallbackForTesting scoped_bootstrap_initialized(base::Bind(
       &BootstrapTest::OnBootstrapInitialized, base::Unretained(this)));
 
@@ -142,7 +150,7 @@ IN_PROC_BROWSER_TEST_F(BootstrapTest, Basic) {
       content::NotificationService::AllSources()).Wait();
 }
 
-IN_PROC_BROWSER_TEST_F(BootstrapTest, PRE_CleanUpFailedUser) {
+IN_PROC_BROWSER_TEST_P(BootstrapTest, PRE_CleanUpFailedUser) {
   ScopedCompleteCallbackForTesting scoped_bootstrap_initialized(base::Bind(
       &BootstrapTest::OnBootstrapInitialized, base::Unretained(this)));
 
@@ -154,8 +162,10 @@ IN_PROC_BROWSER_TEST_F(BootstrapTest, PRE_CleanUpFailedUser) {
   content::RunMessageLoop();
 }
 
-IN_PROC_BROWSER_TEST_F(BootstrapTest, CleanUpFailedUser) {
+IN_PROC_BROWSER_TEST_P(BootstrapTest, CleanUpFailedUser) {
   EXPECT_FALSE(user_manager::UserManager::Get()->IsKnownUser(kFakeUser));
 }
 
+INSTANTIATE_TEST_CASE_P(BootstrapTestSuite, BootstrapTest, testing::Bool());
+
 }  // namespace chromeos