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

chrome/browser/chromeos/policy/force_maximize_on_first_run_chromeos_browsertest.cc

Index: chrome/browser/chromeos/policy/force_maximize_on_first_run_chromeos_browsertest.cc
diff --git a/chrome/browser/chromeos/policy/force_maximize_on_first_run_chromeos_browsertest.cc b/chrome/browser/chromeos/policy/force_maximize_on_first_run_chromeos_browsertest.cc
index e6d3faf186ce8fff21936258343ee79d5497a86c..d2dfaac65c50e2bf4f1312c76e0696a00f66c262 100644
--- a/chrome/browser/chromeos/policy/force_maximize_on_first_run_chromeos_browsertest.cc
+++ b/chrome/browser/chromeos/policy/force_maximize_on_first_run_chromeos_browsertest.cc
@@ -31,7 +31,10 @@ namespace policy {
 
 class ForceMaximizeOnFirstRunTest : public LoginPolicyTestBase {
  protected:
-  ForceMaximizeOnFirstRunTest() : LoginPolicyTestBase() {}
+  ForceMaximizeOnFirstRunTest() : LoginPolicyTestBase() {
+    // TODO(nkostylev): Fix this test for webview. http://crbug.com/477402
+    set_use_webview(false);

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

ditto

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

Done.

+  }
 
   scoped_ptr<base::DictionaryValue> GetMandatoryPoliciesValue() const override {
     scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
@@ -64,7 +67,7 @@ class ForceMaximizeOnFirstRunTest : public LoginPolicyTestBase {
   DISALLOW_COPY_AND_ASSIGN(ForceMaximizeOnFirstRunTest);
 };
 
-IN_PROC_BROWSER_TEST_F(ForceMaximizeOnFirstRunTest, PRE_TwoRuns) {
+IN_PROC_BROWSER_TEST_P(ForceMaximizeOnFirstRunTest, PRE_TwoRuns) {
   SetUpResolution();
   SkipToLoginScreen();
   LogIn(kAccountId, kAccountPassword);
@@ -88,7 +91,7 @@ IN_PROC_BROWSER_TEST_F(ForceMaximizeOnFirstRunTest, PRE_TwoRuns) {
   EXPECT_FALSE(browser1->window()->IsMaximized());
 }
 
-IN_PROC_BROWSER_TEST_F(ForceMaximizeOnFirstRunTest, TwoRuns) {
+IN_PROC_BROWSER_TEST_P(ForceMaximizeOnFirstRunTest, TwoRuns) {
   SetUpResolution();
   content::WindowedNotificationObserver(
       chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE,
@@ -102,7 +105,9 @@ IN_PROC_BROWSER_TEST_F(ForceMaximizeOnFirstRunTest, TwoRuns) {
 
 class ForceMaximizetPolicyFalseTest : public ForceMaximizeOnFirstRunTest {
  protected:
-  ForceMaximizetPolicyFalseTest() : ForceMaximizeOnFirstRunTest() {}
+  ForceMaximizetPolicyFalseTest() : ForceMaximizeOnFirstRunTest() {
+    set_use_webview(GetParam());
+  }
 
   scoped_ptr<base::DictionaryValue> GetMandatoryPoliciesValue() const override {
     scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
@@ -114,7 +119,7 @@ class ForceMaximizetPolicyFalseTest : public ForceMaximizeOnFirstRunTest {
   DISALLOW_COPY_AND_ASSIGN(ForceMaximizetPolicyFalseTest);
 };
 
-IN_PROC_BROWSER_TEST_F(ForceMaximizetPolicyFalseTest, GeneralFirstRun) {
+IN_PROC_BROWSER_TEST_P(ForceMaximizetPolicyFalseTest, GeneralFirstRun) {
   SetUpResolution();
   SkipToLoginScreen();
   LogIn(kAccountId, kAccountPassword);
@@ -127,4 +132,11 @@ IN_PROC_BROWSER_TEST_F(ForceMaximizetPolicyFalseTest, GeneralFirstRun) {
   EXPECT_FALSE(browser->window()->IsMaximized());
 }
 
+INSTANTIATE_TEST_CASE_P(ForceMaximizeOnFirstRunTestSuite,
+                        ForceMaximizeOnFirstRunTest,
+                        testing::Bool());
+INSTANTIATE_TEST_CASE_P(ForceMaximizetPolicyFalseTestSuite,
+                        ForceMaximizetPolicyFalseTest,
+                        testing::Bool());
+
 }  // namespace policy