[reland] MacViews: Allow the toolkit-views Enterprise Signin Confirmation Dialog to be used

chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 124 matching lines @@
 - (void)addButton:(NSButton*)button
         withTitle:(int)resourceID
            target:(id)target
            action:(SEL)action
    shouldAutoSize:(BOOL)shouldAutoSize;
 @end
 
 @implementation ProfileSigninConfirmationViewController
 
 - (id)initWithBrowser:(Browser*)browser
-             username:(const std::string&)username
-             delegate:(ui::ProfileSigninConfirmationDelegate*)delegate
-  closeDialogCallback:(const base::Closure&)closeDialogCallback
- offerProfileCreation:(bool)offer {
+                username:(const std::string&)username
+                delegate:
+                    (std::unique_ptr<ui::ProfileSigninConfirmationDelegate>)
+                        delegate
+     closeDialogCallback:(const base::Closure&)closeDialogCallback
+    offerProfileCreation:(bool)offer {
   if ((self = [super initWithNibName:nil bundle:nil])) {
     browser_ = browser;
     username_ = username;
-    delegate_ = delegate;
+    delegate_ = std::move(delegate);
     closeDialogCallback_ = closeDialogCallback;
     offerProfileCreation_ = offer;
   }
   return self;
 }
 
 - (void)loadView {
   self.view = [[[NSView alloc] initWithFrame:NSZeroRect] autorelease];
   cancelButton_.reset(
       [[ConstrainedWindowButton alloc] initWithFrame:NSZeroRect]);
@@ skipping 206 matching lines @@
       dialogWidth - chrome_style::kCloseButtonPadding -
           NSWidth(closeButtonFrame),
       dialogHeight - chrome_style::kCloseButtonPadding -
           NSWidth(closeButtonFrame));
   [closeButton_ setFrameOrigin:closeOrigin];
 }
 
 - (IBAction)cancel:(id)sender {
   if (delegate_) {
     delegate_->OnCancelSignin();
-    delegate_ = NULL;
+    delegate_ = nullptr;
     closeDialogCallback_.Run();
   }
 }
 
 - (IBAction)ok:(id)sender {
   if (delegate_) {
     delegate_->OnContinueSignin();
-    delegate_ = NULL;
+    delegate_ = nullptr;
     closeDialogCallback_.Run();
   }
 }
 
 - (IBAction)close:(id)sender {
   if (delegate_) {
     delegate_->OnCancelSignin();
-    delegate_ = NULL;
+    delegate_ = nullptr;
   }
   closeDialogCallback_.Run();
 }
 
 - (IBAction)createProfile:(id)sender {
   if (delegate_) {
     delegate_->OnSigninWithNewProfile();
-    delegate_ = NULL;
+    delegate_ = nullptr;
     closeDialogCallback_.Run();
   }
 }
 
 - (void)learnMore {
   chrome::NavigateParams params(
       browser_, GURL(chrome::kChromeEnterpriseSignInLearnMoreURL),
       ui::PAGE_TRANSITION_AUTO_TOPLEVEL);
   params.disposition = WindowOpenDisposition::NEW_POPUP;
   params.window_action = chrome::NavigateParams::SHOW_WINDOW;
@@ skipping 19 matching lines @@
     [button setTitle:base::SysUTF16ToNSString(
         l10n_util::GetStringUTF16(resourceID))];
   [button setTarget:target];
   [button setAction:action];
   [[self view] addSubview:button];
   if (shouldAutoSize)
     [GTMUILocalizerAndLayoutTweaker sizeToFitView:button];
 }
 
 @end
-
-@implementation ProfileSigninConfirmationViewController (TestingAPI)
-
-- (ui::ProfileSigninConfirmationDelegate*)delegate {
-  return delegate_;
-}
-
-- (NSButton*)createProfileButton {
-  return createProfileButton_.get();
-}
-
-- (NSTextView*)explanationField {
-  return explanationField_.get();
-}
-
-@end