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

chrome/browser/chromeos/login/wizard_controller_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/json/json_file_value_serializer.h"
@@ skipping 994 matching lines @@
         user_data_dir.Append(chrome::kLocalStateFilename);
 
     // Set webview disabled flag only when local state file does not exist.
     // Otherwise, we break PRE tests that leave state in it.
     if (!base::PathExists(local_state_path)) {
       base::DictionaryValue local_state_dict;
 
       if (!GetParam())
         local_state_dict.SetBoolean(prefs::kWebviewSigninDisabled, true);
 
-      // TODO(paulmeyer): Re-enable webview version of this test
-      // (drop this condition) once http://crbug.com/452452 is fixed.
-      if (GetParam())
-        local_state_dict.SetBoolean(prefs::kWebviewSigninDisabled, true);
-
       CHECK(JSONFileValueSerializer(local_state_path)
                 .Serialize(local_state_dict));
     }
 
     return WizardControllerTest::SetUpUserDataDirectory();
   }
 
   net::SpawnedTestServer& proxy_server() { return proxy_server_; }
 
  private:
   net::SpawnedTestServer proxy_server_;
 
   DISALLOW_COPY_AND_ASSIGN(WizardControllerProxyAuthOnSigninTest);
 };
 
 IN_PROC_BROWSER_TEST_P(WizardControllerProxyAuthOnSigninTest,
                        ProxyAuthDialogOnSigninScreen) {
   content::WindowedNotificationObserver auth_needed_waiter(
       chrome::NOTIFICATION_AUTH_NEEDED,
       content::NotificationService::AllSources());
 
   CheckCurrentScreen(WizardController::kNetworkScreenName);
 
   LoginDisplayHostImpl::default_host()->StartSignInScreen(LoginScreenContext());
   auth_needed_waiter.Wait();
 }
 
+// TODO(paulmeyer): Re-enable webview version of this test
+// (drop this condition) once http://crbug.com/452452 is fixed.
 INSTANTIATE_TEST_CASE_P(WizardControllerProxyAuthOnSigninSuite,
                         WizardControllerProxyAuthOnSigninTest,
-                        testing::Bool());
+                        testing::Values(false));
 
 class WizardControllerKioskFlowTest : public WizardControllerFlowTest {
  protected:
   WizardControllerKioskFlowTest() {}
 
   // Overridden from InProcessBrowserTest:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     base::FilePath test_data_dir;
     ASSERT_TRUE(chromeos::test_utils::GetTestDataPath(
                     "app_mode", "kiosk_manifest", &test_data_dir));
@@ skipping 206 matching lines @@
 // TODO(merkulova): Add tests for bluetooth HID detection screen variations when
 // UI and logic is ready. http://crbug.com/127016
 
 // TODO(dzhioev): Add tests for controller/host pairing flow.
 // http://crbug.com/375191
 
 static_assert(BaseScreenDelegate::EXIT_CODES_COUNT == 24,
               "tests for new control flow are missing");
 
 }  // namespace chromeos