Flag covering HID-detection OOBE screen removed.

chrome/browser/chromeos/login/wizard_controller.cc

 // Copyright (c) 2012 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/chromeos/login/wizard_controller.h"
 
 #include <signal.h>
 #include <stdlib.h>
 #include <sys/types.h>
 
@@ skipping 81 matching lines @@
   chromeos::WizardController::kNetworkScreenName,
   chromeos::WizardController::kUpdateScreenName,
   chromeos::WizardController::kEulaScreenName,
   chromeos::WizardController::kEnrollmentScreenName,
   chromeos::WizardController::kTermsOfServiceScreenName,
   chromeos::WizardController::kAutoEnrollmentCheckScreenName
 };
 
 // Checks flag for HID-detection screen show.
 bool CanShowHIDDetectionScreen() {
-  return CommandLine::ForCurrentProcess()->HasSwitch(
-      chromeos::switches::kEnableHIDDetectionOnOOBE);
+  return !CommandLine::ForCurrentProcess()->HasSwitch(
+        chromeos::switches::kDisableHIDDetectionOnOOBE);
 }
 
 bool IsResumableScreen(const std::string& screen) {
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kResumableScreens); ++i) {
     if (screen == kResumableScreens[i])
       return true;
   }
   return false;
 }
 
@@ skipping 424 matching lines @@
   FOR_EACH_OBSERVER(Observer, observer_list_, OnSessionStart());
 }
 
 void WizardController::SkipUpdateEnrollAfterEula() {
   skip_update_enroll_after_eula_ = true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // WizardController, ExitHandlers:
 void WizardController::OnHIDDetectionCompleted() {
-  ShowNetworkScreen();
+  // Check for tests configuration.
+  if (!StartupUtils::IsOobeCompleted())
+    ShowNetworkScreen();
 }
 
 void WizardController::OnNetworkConnected() {
   if (is_official_build_) {
     if (!StartupUtils::IsEulaAccepted()) {
       ShowEulaScreen();
     } else {
       // Possible cases:
       // 1. EULA was accepted, forced shutdown/reboot during update.
       // 2. EULA was accepted, planned reboot after update.
@@ skipping 562 matching lines @@
 bool WizardController::SetOnTimeZoneResolvedForTesting(
     const base::Closure& callback) {
   if (timezone_resolved_)
     return false;
 
   on_timezone_resolved_for_testing_ = callback;
   return true;
 }
 
 }  // namespace chromeos