Revert of [Merge to M50] Enable bootstrapping feature by default.

chrome/browser/chromeos/login/wizard_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_
 
 #include <map>
 #include <string>
 
@@ skipping 292 matching lines @@
 
   // Called from SimpleGeolocationProvider when location is resolved.
   void OnLocationResolved(const Geoposition& position,
                           bool server_error,
                           const base::TimeDelta elapsed);
 
   // Returns true if callback has been installed.
   // Returns false if timezone has already been resolved.
   bool SetOnTimeZoneResolvedForTesting(const base::Closure& callback);
 
-  // Returns true if kHostPairingOobe perf has been set. If it's set, launch the
-  // pairing remora OOBE from the beginning no matter an eligible controller is
-  // detected or not.
+  // Returns true for pairing remora OOBE.
   bool IsRemoraPairingOobe() const;
 
+  // Returns true for pairing slave OOBE.
+  bool IsSlavePairingOobe() const;
+
   // Starts listening for an incoming shark controller connection, if we are
   // running remora OOBE.
   void MaybeStartListeningForSharkConnection();
 
   // Called when a connection to controller has been established. Wizard
   // controller takes the ownership of |pairing_controller| after that call.
   void OnSharkConnected(
       scoped_ptr<pairing_chromeos::HostPairingController> pairing_controller);
 
   // Callback function for AddNetworkRequested().
@@ skipping 93 matching lines @@
   // Pairing controller for remora devices.
   scoped_ptr<pairing_chromeos::HostPairingController> remora_controller_;
 
   // Maps screen ids to last time of their shows.
   base::hash_map<std::string, base::Time> screen_show_times_;
 
   // Tests check result of timezone resolve.
   bool timezone_resolved_ = false;
   base::Closure on_timezone_resolved_for_testing_;
 
+  // True if shark device initiated connection to this device.
+  bool shark_controller_detected_ = false;
+
   // Listens for incoming connection from a shark controller if a regular (not
   // pairing) remora OOBE is active. If connection is established, wizard
   // conroller swithces to a pairing OOBE.
   scoped_ptr<pairing_chromeos::SharkConnectionListener>
       shark_connection_listener_;
 
   BaseScreen* hid_screen_ = nullptr;
 
   base::WeakPtrFactory<WizardController> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WizardController);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_