cros: Fold HIDDetectionModel into HIDDetectionScreen.

chrome/browser/chromeos/login/screens/hid_detection_screen_browsertest.cc

 // Copyright (c) 2016 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 "base/macros.h"
 #include "chrome/browser/chromeos/device/input_service_test_helper.h"
 #include "chrome/browser/chromeos/login/screens/base_screen.h"
 #include "chrome/browser/chromeos/login/screens/hid_detection_screen.h"
 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
 #include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h"
@@ skipping 45 matching lines @@
   HIDDetectionScreen* hid_detection_screen_;
   std::unique_ptr<InputServiceTestHelper> helper_;
 
   DISALLOW_COPY_AND_ASSIGN(HIDDetectionScreenTest);
 };
 
 IN_PROC_BROWSER_TEST_F(HIDDetectionScreenTest, MouseKeyboardStates) {
   // NOTE: State strings match those in hid_detection_screen.cc.
   // No devices added yet
   EXPECT_EQ("searching",
-            context()->GetString(HIDDetectionModel::kContextKeyMouseState));
+            context()->GetString(HIDDetectionScreen::kContextKeyMouseState));
   EXPECT_EQ("searching",
-            context()->GetString(HIDDetectionModel::kContextKeyKeyboardState));
+            context()->GetString(HIDDetectionScreen::kContextKeyKeyboardState));
   EXPECT_FALSE(context()->GetBoolean(
-      HIDDetectionModel::kContextKeyContinueButtonEnabled));
+      HIDDetectionScreen::kContextKeyContinueButtonEnabled));
 
   // Generic connection types. Unlike the pointing device, which may be a tablet
   // or touchscreen, the keyboard only reports usb and bluetooth states.
   helper()->AddDeviceToService(true, InputDeviceInfo::TYPE_SERIO);
   EXPECT_TRUE(context()->GetBoolean(
-      HIDDetectionModel::kContextKeyContinueButtonEnabled));
+      HIDDetectionScreen::kContextKeyContinueButtonEnabled));
 
   helper()->AddDeviceToService(false, InputDeviceInfo::TYPE_SERIO);
   EXPECT_EQ("connected",
-            context()->GetString(HIDDetectionModel::kContextKeyMouseState));
+            context()->GetString(HIDDetectionScreen::kContextKeyMouseState));
   EXPECT_EQ("usb",
-            context()->GetString(HIDDetectionModel::kContextKeyKeyboardState));
+            context()->GetString(HIDDetectionScreen::kContextKeyKeyboardState));
   EXPECT_TRUE(context()->GetBoolean(
-      HIDDetectionModel::kContextKeyContinueButtonEnabled));
+      HIDDetectionScreen::kContextKeyContinueButtonEnabled));
 
   // Remove generic devices, add usb devices.
   helper()->RemoveDeviceFromService(true);
   helper()->RemoveDeviceFromService(false);
   EXPECT_FALSE(context()->GetBoolean(
-      HIDDetectionModel::kContextKeyContinueButtonEnabled));
+      HIDDetectionScreen::kContextKeyContinueButtonEnabled));
 
   helper()->AddDeviceToService(true, InputDeviceInfo::TYPE_USB);
   helper()->AddDeviceToService(false, InputDeviceInfo::TYPE_USB);
   EXPECT_EQ("usb",
-            context()->GetString(HIDDetectionModel::kContextKeyMouseState));
+            context()->GetString(HIDDetectionScreen::kContextKeyMouseState));
   EXPECT_EQ("usb",
-            context()->GetString(HIDDetectionModel::kContextKeyKeyboardState));
+            context()->GetString(HIDDetectionScreen::kContextKeyKeyboardState));
   EXPECT_TRUE(context()->GetBoolean(
-      HIDDetectionModel::kContextKeyContinueButtonEnabled));
+      HIDDetectionScreen::kContextKeyContinueButtonEnabled));
 
   // Remove usb devices, add bluetooth devices.
   helper()->RemoveDeviceFromService(true);
   helper()->RemoveDeviceFromService(false);
   EXPECT_FALSE(context()->GetBoolean(
-      HIDDetectionModel::kContextKeyContinueButtonEnabled));
+      HIDDetectionScreen::kContextKeyContinueButtonEnabled));
 
   helper()->AddDeviceToService(true, InputDeviceInfo::TYPE_BLUETOOTH);
   helper()->AddDeviceToService(false, InputDeviceInfo::TYPE_BLUETOOTH);
   EXPECT_EQ("paired",
-            context()->GetString(HIDDetectionModel::kContextKeyMouseState));
+            context()->GetString(HIDDetectionScreen::kContextKeyMouseState));
   EXPECT_EQ("paired",
-            context()->GetString(HIDDetectionModel::kContextKeyKeyboardState));
+            context()->GetString(HIDDetectionScreen::kContextKeyKeyboardState));
   EXPECT_TRUE(context()->GetBoolean(
-      HIDDetectionModel::kContextKeyContinueButtonEnabled));
+      HIDDetectionScreen::kContextKeyContinueButtonEnabled));
 }
 
 // Test that if there is any Bluetooth device connected on HID screen, the
 // Bluetooth adapter should not be disabled after advancing to the next screen.
 IN_PROC_BROWSER_TEST_F(HIDDetectionScreenTest, BluetoothDeviceConnected) {
   OobeScreenWaiter(OobeScreen::SCREEN_OOBE_HID_DETECTION).Wait();
   EXPECT_TRUE(adapter()->IsPowered());
 
   // Add a pair of USB mouse/keyboard so that |pointing_device_connect_type_|
   // and |keyboard_device_connect_type_| are InputDeviceInfo::TYPE_USB.
@@ skipping 23 matching lines @@
 
   // Simulate the user's click on "Continue" button.
   hid_detection_screen()->OnContinueButtonClicked();
   OobeScreenWaiter(OobeScreen::SCREEN_OOBE_NETWORK).Wait();
 
   // The adapter should be powered off at this moment.
   EXPECT_FALSE(adapter()->IsPowered());
 }
 
 }  // namespace chromeos