Move ownership of the ControllerPairingController into the WizardController.

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

 // Copyright 2014 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_SCREENS_CONTROLLER_PAIRING_SCREEN_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_CONTROLLER_PAIRING_SCREEN_H_
 
 #include "base/macros.h"
 
 #include "chrome/browser/chromeos/login/screens/controller_pairing_screen_actor.h"
 #include "chrome/browser/chromeos/login/screens/screen_context.h"
 #include "chrome/browser/chromeos/login/screens/wizard_screen.h"
 #include "components/pairing/controller_pairing_controller.h"
 
 namespace chromeos {
 
 class ControllerPairingScreen :
   public WizardScreen,
   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:
   typedef pairing_chromeos::ControllerPairingController::Stage Stage;
 
   void CommitContextChanges();
   bool ExpectStageIs(Stage stage) const;
 
   // Overridden from WizardScreen:
   virtual void PrepareToShow() OVERRIDE;
@@ skipping 10 matching lines @@
   virtual void OnScreenContextChanged(
       const base::DictionaryValue& diff) OVERRIDE;
   virtual void OnUserActed(const std::string& action) OVERRIDE;
 
   // Context for sharing data between C++ and JS.
   // TODO(dzhioev): move to BaseScreen when possible.
   ScreenContext context_;
 
   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_;
 
   // If this one is |false| first device in device list will be preselected on
   // next device list update.
   bool device_preselected_;
 
   DISALLOW_COPY_AND_ASSIGN(ControllerPairingScreen);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_CONTROLLER_PAIRING_SCREEN_H_