Chrome OS: turn on MD-OOBE for CfM devices.

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 <stddef.h>
 #include <stdlib.h>
 #include <sys/types.h>
@@ skipping 322 matching lines @@
   // change and affect the OOBE again.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           chromeos::switches::kDisableMdOobe))
     SetShowMdOobe(false);
   else if ((screen_pref.empty() ||
             GetLocalState()->HasPrefPath(prefs::kOobeMdMode)) ||
            GetLocalState()->GetBoolean(prefs::kOobeMdMode))
     SetShowMdOobe(true);
 
   // TODO(drcrash): Remove this after testing (http://crbug.com/647411).
-  if (IsRemoraPairingOobe() || IsSharkRequisition() || IsRemoraRequisition()) {
+  if (IsRemoraPairingOobe() || IsSharkRequisition()) {
     SetShowMdOobe(false);
   }
 
   AdvanceToScreen(first_screen_);
   if (!IsMachineHWIDCorrect() && !StartupUtils::IsDeviceRegistered() &&
       first_screen_ == OobeScreen::SCREEN_UNKNOWN)
     ShowWrongHWIDScreen();
 }
 
 ErrorScreen* WizardController::GetErrorScreen() {
@@ skipping 1186 matching lines @@
   SetCurrentScreen(screen);
 }
 
 AutoEnrollmentController* WizardController::GetAutoEnrollmentController() {
   if (!auto_enrollment_controller_)
     auto_enrollment_controller_ = base::MakeUnique<AutoEnrollmentController>();
   return auto_enrollment_controller_.get();
 }
 
 }  // namespace chromeos