Fix update and enrollment flow

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 308 matching lines @@
   static bool zero_delay_enabled_;
 
   // Screen that's currently active.
   WizardScreen* current_screen_;
 
   // Screen that was active before, or NULL for login screen.
   WizardScreen* previous_screen_;
 
   std::string username_;
   std::string password_;
-  std::string auth_token_;
 
   // True if running official BUILD.
   bool is_official_build_;
 
   // True if full OOBE flow should be shown.
   bool is_out_of_box_;
 
   // Value of the screen name that WizardController was started with.
   std::string first_screen_name_;
 
@@ skipping 47 matching lines @@
   friend class WizardControllerOobeResumeTest;
   friend class WizardInProcessBrowserTest;
   friend class WizardControllerBrokenLocalStateTest;
 
   scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
 
   scoped_ptr<SimpleGeolocationProvider> geolocation_provider_;
   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_;
 
   // Tests check result of timezone resolve.
   bool timezone_resolved_;
   base::Closure on_timezone_resolved_for_testing_;
 
   // True if shark device initiated connection to this device.
   bool shark_controller_detected_;
 
   // 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_;
 
   base::WeakPtrFactory<WizardController> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WizardController);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_