Move ownership of the ControllerPairingController into the WizardController.

chrome/browser/chromeos/login/screens/controller_pairing_screen.h

Index: chrome/browser/chromeos/login/screens/controller_pairing_screen.h
diff --git a/chrome/browser/chromeos/login/screens/controller_pairing_screen.h b/chrome/browser/chromeos/login/screens/controller_pairing_screen.h
index c280e4b8e976e8ccd83b9ba1243e43fb1b48e53c..cd66be696e813118fe7b41a52e3a1704f1343194 100644
--- a/chrome/browser/chromeos/login/screens/controller_pairing_screen.h
+++ b/chrome/browser/chromeos/login/screens/controller_pairing_screen.h
@@ -19,8 +19,10 @@ class ControllerPairingScreen :
   public pairing_chromeos::ControllerPairingController::Observer,
   public ControllerPairingScreenActor::Delegate {
  public:
-  ControllerPairingScreen(ScreenObserver* observer,
-                          ControllerPairingScreenActor* actor);
+  ControllerPairingScreen(
+      ScreenObserver* observer,
+      ControllerPairingScreenActor* actor,
+      pairing_chromeos::ControllerPairingController* controller);
   virtual ~ControllerPairingScreen();
 
  private:
@@ -51,9 +53,8 @@ class ControllerPairingScreen :
 
   ControllerPairingScreenActor* actor_;
 
-  // Controller performing pairing. Owned by the screen for now.
-  // TODO(dzhioev): move to proper place later.
-  scoped_ptr<pairing_chromeos::ControllerPairingController> controller_;
+  // Controller performing pairing. Owned by the wizard controller.
+  pairing_chromeos::ControllerPairingController* controller_;

[achuithb, 2014/09/03 22:26:07]

Should this be a weak reference?

[Zachary Kuznia, 2014/09/04 04:21:48]

No, for same reason that |actor_| is not a weak pointer.  The owner of this
object also owns |controller_|, so making it a weak pointer would make it harder
to understand the ownership graph from reading this file..

 
   // Current stage of pairing process.
   Stage current_stage_;