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 349 matching lines @@
 
   // Skip screen if both devices are present.
   bool all_devices_autodetected = !pointing_device_id_.empty() &&
                                   !keyboard_device_id_.empty();
   UMA_HISTOGRAM_BOOLEAN("HIDDetection.OOBEDialogShown",
                         !all_devices_autodetected);
   if (all_devices_autodetected) {
     HandleOnContinue();
     return;
   }
+  core_oobe_actor_->InitDemoModeDetection();
   PrefService* local_state = g_browser_process->local_state();
   int num_of_times_dialog_was_shown = local_state->GetInteger(
       prefs::kTimesHIDDialogShown);
   local_state->SetInteger(prefs::kTimesHIDDialogShown,
                           num_of_times_dialog_was_shown + 1);
   first_time_screen_show_ = false;
 
   TryInitiateBTDevicesUpdate();
 }
 
@@ skipping 99 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