Check for channel and flag before allowing demo mode.

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/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
@@ skipping 94 matching lines @@
 
 void HIDDetectionScreenHandler::FindDevicesError() {
   VLOG(1) << "Failed to start Bluetooth discovery.";
 }
 
 void HIDDetectionScreenHandler::Show() {
   if (!page_is_ready()) {
     show_on_init_ = true;
     return;
   }
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableDemoMode))
-    core_oobe_actor_->InitDemoModeDetection();
+  core_oobe_actor_->InitDemoModeDetection();
   input_service_proxy_.AddObserver(this);
   UpdateDevices();
 
   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);
 
   ShowScreen(OobeUI::kScreenHIDDetection, NULL);
@@ skipping 455 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