Change ChooserController ownership model

chrome/browser/ui/website_settings/chooser_bubble_delegate.h

 // Copyright 2015 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_UI_WEBSITE_SETTINGS_CHOOSER_BUBBLE_DELEGATE_H_
 #define CHROME_BROWSER_UI_WEBSITE_SETTINGS_CHOOSER_BUBBLE_DELEGATE_H_
 
 #include "base/macros.h"
 #include "components/bubble/bubble_delegate.h"
 
 class Browser;
 class ChooserController;
 
 namespace content {
 class RenderFrameHost;
 }
 
 // ChooserBubbleDelegate overrides GetName() to identify the bubble
 // you define for collecting metrics. Create an instance of this
 // class and pass it to BubbleManager::ShowBubble() to show the bubble.
 class ChooserBubbleDelegate : public BubbleDelegate {
  public:
   explicit ChooserBubbleDelegate(

[msw, 2016/06/22 18:23:17]

nit: remove explicit

[juncai, 2016/06/22 22:41:20]

Done.

       content::RenderFrameHost* owner,
       std::unique_ptr<ChooserController> chooser_controller);
   ~ChooserBubbleDelegate() override;
 
   // BubbleDelegate:
   std::string GetName() const override;
   std::unique_ptr<BubbleUi> BuildBubbleUi() override;
   const content::RenderFrameHost* OwningFrame() const override;
 
-  ChooserController* chooser_controller() const {
-    return chooser_controller_.get();
-  }
-
  private:
   const content::RenderFrameHost* const owning_frame_;
   Browser* browser_;
+  // |chooser_controller_| is not owned by this class, it is owned by
+  // ChooserContentView(non-Mac)/ChooserContentViewCocoa(Mac).

[msw, 2016/06/22 18:23:17]

optional nit: update all the comments to instead say ChooserContentView[Cocoa]

[juncai, 2016/06/22 22:41:20]

Done.

+  // This field only temporarily owns the ChooserController. It is moved
+  // into the ChooserContentView/ChooserContentViewCocoa when
+  // BuildBubbleUi() is called and the bubble is shown.

[msw, 2016/06/22 18:23:17]

aside: Once again, I really wish the bubble manager code either didn't exist or
served some purpose... as-is it's just increasing complexity with no value.

[juncai, 2016/06/22 22:41:20]

Acknowledged.

   std::unique_ptr<ChooserController> chooser_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(ChooserBubbleDelegate);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBSITE_SETTINGS_CHOOSER_BUBBLE_DELEGATE_H_