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

chrome/browser/chromeos/system/device_disabling_browsertest.cc

 // Copyright 2014 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 <string>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ skipping 30 matching lines @@
 
 namespace {
 
 void ErrorCallbackFunction(const std::string& error_name,
                            const std::string& error_message) {
   LOG(ERROR) << "Shill Error: " << error_name << " : " << error_message;
 }
 
 }  // namespace
 
+// Boolean parameter is used to run this test for webview (true) and for
+// iframe (false) GAIA sign in.
 class DeviceDisablingTest
     : public OobeBaseTest,
-      public NetworkStateInformer::NetworkStateInformerObserver {
+      public NetworkStateInformer::NetworkStateInformerObserver,
+      public testing::WithParamInterface<bool> {
  public:
   DeviceDisablingTest();
 
   // Sets up a device state blob that indicates the device is disabled, triggers
   // a policy plus device state fetch and waits for it to succeed.
   void MarkDisabledAndWaitForPolicyFetch();
 
   std::string GetCurrentScreenName(content::WebContents* web_contents);
 
  protected:
   base::RunLoop network_state_change_wait_run_loop_;
 
  private:
   // OobeBaseTest:
   void SetUpInProcessBrowserTestFixture() override;
   void SetUpOnMainThread() override;
 
   // NetworkStateInformer::NetworkStateInformerObserver:
   void UpdateState(NetworkError::ErrorReason reason) override;
 
   FakeSessionManagerClient* fake_session_manager_client_;
   policy::DevicePolicyCrosTestHelper test_helper_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceDisablingTest);
 };
 
 
 DeviceDisablingTest::DeviceDisablingTest()
     : fake_session_manager_client_(new FakeSessionManagerClient) {
+  set_use_webview(GetParam());
 }
 
 void DeviceDisablingTest::MarkDisabledAndWaitForPolicyFetch() {
   base::RunLoop run_loop;
   // Set up an |observer| that will wait for the disabled setting to change.
   scoped_ptr<CrosSettings::ObserverSubscription> observer =
       CrosSettings::Get()->AddSettingsObserver(
            kDeviceDisabled,
            run_loop.QuitClosure());
   // Prepare a policy fetch response that indicates the device is disabled.
@@ skipping 35 matching lines @@
 
   // Set up fake networks.
   DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
       SetupDefaultEnvironment();
 }
 
 void DeviceDisablingTest::UpdateState(NetworkError::ErrorReason reason) {
   network_state_change_wait_run_loop_.Quit();
 }
 
-
-IN_PROC_BROWSER_TEST_F(DeviceDisablingTest, DisableDuringNormalOperation) {
+IN_PROC_BROWSER_TEST_P(DeviceDisablingTest, DisableDuringNormalOperation) {
   // Mark the device as disabled and wait until cros settings update.
   MarkDisabledAndWaitForPolicyFetch();
 
   // Verify that the device disabled screen is being shown.
   WizardController* const wizard_controller =
       WizardController::default_controller();
   ASSERT_TRUE(wizard_controller);
   EXPECT_EQ(wizard_controller->GetScreen(
                 WizardController::kDeviceDisabledScreenName),
             wizard_controller->current_screen());
 }
 
 // Verifies that device disabling works when the ephemeral users policy is
 // enabled. This case warrants its own test because the UI behaves somewhat
 // differently when the policy is set: A background job runs on startup that
 // causes the UI to try and show the login screen after some delay. It must
 // be ensured that the login screen does not show and does not clobber the
 // disabled screen.
-IN_PROC_BROWSER_TEST_F(DeviceDisablingTest, DisableWithEphemeralUsers) {
+IN_PROC_BROWSER_TEST_P(DeviceDisablingTest, DisableWithEphemeralUsers) {
   // Connect to the fake Ethernet network. This ensures that Chrome OS will not
   // try to show the offline error screen.
   base::RunLoop connect_run_loop;
   DBusThreadManager::Get()->GetShillServiceClient()->Connect(
       dbus::ObjectPath("/service/eth1"),
       connect_run_loop.QuitClosure(),
       base::Bind(&ErrorCallbackFunction));
   connect_run_loop.Run();
 
   // Skip to the login screen.
@@ skipping 43 matching lines @@
   SimulateNetworkOffline();
   network_state_change_wait_run_loop_.Run();
   network_state_informer->RemoveObserver(this);
   base::RunLoop().RunUntilIdle();
 
   // Verify that the offline error screen was not shown and the device disabled
   // screen is still being shown instead.
   EXPECT_EQ(OobeUI::kScreenDeviceDisabled, GetCurrentScreenName(web_contents));
 }
 
+INSTANTIATE_TEST_CASE_P(DeviceDisablingSuite,
+                        DeviceDisablingTest,
+                        testing::Bool());
+
 }  // namespace system
 }  // namespace chromeos