Change ChooserController ownership model

chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller_unittest.mm

 // Copyright 2016 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.
 
 #import "chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include <memory>
 #include <vector>
@@ skipping 17 matching lines @@
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(browser());
   }
 
   // Create a ChooserDialogCocoa.
   void CreateChooserDialog() {
     content::WebContents* web_contents =
         content::WebContents::Create(content::WebContents::CreateParams(
             profile(), content::SiteInstance::Create(profile())));
     ASSERT_TRUE(web_contents);
-    chooser_controller_.reset(
+    std::unique_ptr<MockChooserController> chooser_controller(
         new MockChooserController(web_contents->GetMainFrame()));
-    ASSERT_TRUE(chooser_controller_);
+    ASSERT_TRUE(chooser_controller);
+    chooser_controller_ = chooser_controller.get();
     chooser_dialog_.reset(
-        new ChooserDialogCocoa(web_contents, chooser_controller_.get()));
+        new ChooserDialogCocoa(web_contents, std::move(chooser_controller)));
     ASSERT_TRUE(chooser_dialog_);
     chooser_dialog_controller_ =
         chooser_dialog_->chooser_dialog_cocoa_controller_.get();
     ASSERT_TRUE(chooser_dialog_controller_);
     chooser_content_view_ = [chooser_dialog_controller_ chooserContentView];
     ASSERT_TRUE(chooser_content_view_);
     table_view_ = [chooser_content_view_ tableView];
     ASSERT_TRUE(table_view_);
     connect_button_ = [chooser_content_view_ connectButton];
     ASSERT_TRUE(connect_button_);
     cancel_button_ = [chooser_content_view_ cancelButton];
     ASSERT_TRUE(cancel_button_);
     help_button_ = [chooser_content_view_ helpButton];
     ASSERT_TRUE(help_button_);
   }
 
-  std::unique_ptr<MockChooserController> chooser_controller_;
   std::unique_ptr<ChooserDialogCocoa> chooser_dialog_;
 
+  MockChooserController* chooser_controller_;
   ChooserDialogCocoaController* chooser_dialog_controller_;
   ChooserContentViewCocoa* chooser_content_view_;
   NSTableView* table_view_;
   NSButton* connect_button_;
   NSButton* cancel_button_;
   NSButton* help_button_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ChooserDialogCocoaControllerTest);
 };
@@ skipping 288 matching lines @@
   chooser_controller_->OptionAdded(base::ASCIIToUTF16("c"));
 
   // Select option 0 and press "Get help" button.
   [table_view_ selectRowIndexes:[NSIndexSet indexSetWithIndex:0]
            byExtendingSelection:NO];
   EXPECT_CALL(*chooser_controller_, Select(testing::_)).Times(0);
   EXPECT_CALL(*chooser_controller_, Cancel()).Times(0);
   EXPECT_CALL(*chooser_controller_, OpenHelpCenterUrl()).Times(1);
   [help_button_ performClick:chooser_dialog_controller_];
 }