Flag covering HID-detection OOBE screen removed.

chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.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 "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/metrics/histogram.h"
@@ skipping 46 matching lines @@
 
 bool DeviceIsKeyboard(device::BluetoothDevice::DeviceType device_type) {
   return device_type == device::BluetoothDevice::DEVICE_KEYBOARD ||
          device_type == device::BluetoothDevice::DEVICE_KEYBOARD_MOUSE_COMBO;
 }
 
 }  // namespace
 
 namespace chromeos {
 
-HIDDetectionScreenHandler::HIDDetectionScreenHandler()
+HIDDetectionScreenHandler::HIDDetectionScreenHandler(
+    CoreOobeActor* core_oobe_actor)
     : BaseScreenHandler(kJsScreenPath),
       delegate_(NULL),
+      core_oobe_actor_(core_oobe_actor),
       show_on_init_(false),
       mouse_is_pairing_(false),
       keyboard_is_pairing_(false),
       switch_on_adapter_when_ready_(false),
       first_time_screen_show_(true),
       weak_ptr_factory_(this) {
 }
 
 HIDDetectionScreenHandler::~HIDDetectionScreenHandler() {
   if (adapter_.get())
@@ skipping 16 matching lines @@
 
 void HIDDetectionScreenHandler::FindDevicesError() {
   VLOG(1) << "Failed to start Bluetooth discovery.";
 }
 
 void HIDDetectionScreenHandler::Show() {
   if (!page_is_ready()) {
     show_on_init_ = true;
     return;
   }
+  core_oobe_actor_->InitDemoModeDetection();
   input_service_proxy_.AddObserver(this);
   first_time_screen_show_ = true;
   GetDevicesFirstTime();
   ShowScreen(OobeUI::kScreenHIDDetection, NULL);
 }
 
 void HIDDetectionScreenHandler::Hide() {
   if (adapter_.get())
     adapter_->RemoveObserver(this);
   input_service_proxy_.RemoveObserver(this);
@@ skipping 51 matching lines @@
     else if (pointing_device_id_.empty())
       scenario_type = KEYBOARD_DEVICE_ONLY_DETECTED;
     else
       scenario_type = POINTING_DEVICE_ONLY_DETECTED;
 
     UMA_HISTOGRAM_ENUMERATION(
         "HIDDetection.OOBEDevicesDetectedOnContinuePressed",
         scenario_type,
         CONTINUE_SCENARIO_TYPE_SIZE);
   }
+  core_oobe_actor_->StopDemoModeDetection();
   if (delegate_)
     delegate_->OnExit();
 }
 
 void HIDDetectionScreenHandler::InitializeAdapter(
     scoped_refptr<device::BluetoothAdapter> adapter) {
   adapter_ = adapter;
   CHECK(adapter_.get());
 
   adapter_->AddObserver(this);
@@ skipping 361 matching lines @@
         l10n_util::GetStringFUTF16(
             IDS_HID_DETECTION_PAIRED_BLUETOOTH_KEYBOARD,
             base::UTF8ToUTF16(keyboard_device_name_)));
   } else {
     state_info.SetString("state", kUSBConnectedState);
   }
   CallJS("setKeyboardDeviceState", state_info);
 }
 
 }  // namespace chromeos