Fix update and enrollment flow

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 ed27da6639ad5353b86e7d1cc5d2659e9a2f4ad2..eb32a4f232da15296396fa002d15e3747af51677 100644
--- a/chrome/browser/chromeos/login/wizard_controller.h
+++ b/chrome/browser/chromeos/login/wizard_controller.h
@@ -326,7 +326,6 @@ class WizardController : public ScreenObserver, public ScreenManager {
 
   std::string username_;
   std::string password_;
-  std::string auth_token_;
 
   // True if running official BUILD.
   bool is_official_build_;
@@ -394,11 +393,10 @@ class WizardController : public ScreenObserver, public ScreenManager {
   scoped_ptr<TimeZoneProvider> timezone_provider_;
 
   // Pairing controller for shark devices.
-  scoped_ptr<pairing_chromeos::ControllerPairingController>
-      controller_pairing_controller_;
+  scoped_ptr<pairing_chromeos::ControllerPairingController> shark_controller_;
 
   // Pairing controller for remora devices.
-  scoped_ptr<pairing_chromeos::HostPairingController> host_pairing_controller_;
+  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_;