[Merge to M50] Enable bootstrapping feature by default.

chrome/browser/chromeos/login/wizard_controller.h

Index: chrome/browser/chromeos/login/wizard_controller.h
diff --git a/chrome/browser/chromeos/login/wizard_controller.h b/chrome/browser/chromeos/login/wizard_controller.h
index aa2a6131136533f1a14b667b22cc5226931c220c..4e0b82a7c029bc95d27bae0a871f300c84c71b65 100644
--- a/chrome/browser/chromeos/login/wizard_controller.h
+++ b/chrome/browser/chromeos/login/wizard_controller.h
@@ -310,12 +310,11 @@ class WizardController : public BaseScreenDelegate,
   // Returns false if timezone has already been resolved.
   bool SetOnTimeZoneResolvedForTesting(const base::Closure& callback);
 
-  // Returns true for pairing remora OOBE.
+  // 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.
   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();
@@ -429,9 +428,6 @@ class WizardController : public BaseScreenDelegate,
   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.