Revert of Revert "Enable BlockingLoginTest, ForceMaximizeOnFirstRunTest, UserCloudPolicyManagerTest

chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.cc

Index: chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.cc
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.cc
index fff003698e3e3ba65378d417d23a3314b15354de..0105d8813e5157bc02218b0ebad6c92e005325da 100644
--- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.cc
+++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.cc
@@ -17,9 +17,14 @@
 
 namespace policy {
 
-class UserCloudPolicyManagerTest : public LoginPolicyTestBase {
+// Boolean parameter is used to run this test for webview (true) and for
+// iframe (false) GAIA sign in.
+class UserCloudPolicyManagerTest : public LoginPolicyTestBase,
+                                   public testing::WithParamInterface<bool> {
  protected:
-  UserCloudPolicyManagerTest() : LoginPolicyTestBase() {}
+  UserCloudPolicyManagerTest() : LoginPolicyTestBase() {
+    set_use_webview(GetParam());
+  }
 
   scoped_ptr<base::DictionaryValue> GetMandatoryPoliciesValue() const override {
     scoped_ptr<base::ListValue> list(new base::ListValue);
@@ -38,7 +43,7 @@
   DISALLOW_COPY_AND_ASSIGN(UserCloudPolicyManagerTest);
 };
 
-IN_PROC_BROWSER_TEST_F(UserCloudPolicyManagerTest, StartSession) {
+IN_PROC_BROWSER_TEST_P(UserCloudPolicyManagerTest, StartSession) {
   const char* const kStartupURLs[] = {"chrome://policy", "chrome://about"};
 
   SkipToLoginScreen();
@@ -61,4 +66,8 @@
   }
 }
 
+INSTANTIATE_TEST_CASE_P(UserCloudPolicyManagerTestSuite,
+                        UserCloudPolicyManagerTest,
+                        testing::Bool());
+
 }  // namespace policy