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

chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller_browsertest.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"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/mac/scoped_nsobject.h"
 #include "base/macros.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/sync/profile_signin_confirmation_helper.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #import "testing/gtest_mac.h"
 #include "ui/base/l10n/l10n_util.h"
 
+@interface ProfileSigninConfirmationViewController (TestingAPI)
+
+@property(readonly, nonatomic) ui::ProfileSigninConfirmationDelegate* delegate;
+@property(readonly, nonatomic) NSButton* createProfileButton;
+@property(readonly, nonatomic) NSTextView* explanationField;
+
+@end
+
+@implementation ProfileSigninConfirmationViewController (TestingAPI)
+
+- (ui::ProfileSigninConfirmationDelegate*)delegate {
+  return delegate_.get();
+}
+
+- (NSButton*)createProfileButton {
+  return createProfileButton_.get();
+}
+
+- (NSTextView*)explanationField {
+  return explanationField_.get();
+}
+
+@end
+
 class ProfileSigninConfirmationViewControllerTest
-  : public InProcessBrowserTest,
-    public ui::ProfileSigninConfirmationDelegate {
-
+    : public InProcessBrowserTest {
  public:
   ProfileSigninConfirmationViewControllerTest()
     : window_(nil),
       continued_(false),
       cancelled_(false),
       created_(false),
       closed_(false) {
   }
 
  protected:
   void SetUpOnMainThread() override {}
 
   void SetupDialog(bool offerProfileCreation = true) {
     window_.reset(
         [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 400, 600)
                                     styleMask:NSBorderlessWindowMask
                                       backing:NSBackingStoreBuffered
                                         defer:NO]);
     base::Closure close = base::Bind(
         &ProfileSigninConfirmationViewControllerTest::OnClose,
         base::Unretained(this));
     controller_.reset([[ProfileSigninConfirmationViewController alloc]
-                        initWithBrowser:browser()
-                               username:username()
-                               delegate:this
-                    closeDialogCallback:close
-                   offerProfileCreation:offerProfileCreation]);
+             initWithBrowser:browser()
+                    username:username()
+                    delegate:base::MakeUnique<TestSigninDelegate>(this)
+         closeDialogCallback:close
+        offerProfileCreation:offerProfileCreation]);
     [[window_ contentView] addSubview:[controller_ view]];
     [window_ makeKeyAndOrderFront:NSApp];
     ASSERT_TRUE([window_ isVisible]);
   }
 
   // Test helpers.
   std::string username() {
     return "foo@bar.com";
   }
   base::string16 learn_more() {
     return l10n_util::GetStringUTF16(
         IDS_ENTERPRISE_SIGNIN_PROFILE_LINK_LEARN_MORE);
   }
 
-  // ui::ProfileSigninConfirmationDelegate:
-  void OnContinueSignin() override { continued_ = true; }
-  void OnCancelSignin() override { cancelled_ = true; }
-  void OnSigninWithNewProfile() override { created_ = true; }
   void OnClose() { closed_ = true; }
 
   // The window containing the dialog.
   base::scoped_nsobject<NSWindow> window_;
 
   // Dialog under test.
   base::scoped_nsobject<ProfileSigninConfirmationViewController> controller_;
 
   // Visible for testing UI interactions.
   bool continued_;
   bool cancelled_;
   bool created_;
   bool closed_;
 
  private:
+  class TestSigninDelegate : public ui::ProfileSigninConfirmationDelegate {
+   public:
+    explicit TestSigninDelegate(
+        ProfileSigninConfirmationViewControllerTest* client)
+        : client_(client) {}
+
+    // ui::ProfileSigninConfirmationDelegate:
+    void OnContinueSignin() override { client_->continued_ = true; }
+    void OnCancelSignin() override { client_->cancelled_ = true; }
+    void OnSigninWithNewProfile() override { client_->created_ = true; }
+
+   private:
+    ProfileSigninConfirmationViewControllerTest* client_;
+
+    DISALLOW_COPY_AND_ASSIGN(TestSigninDelegate);
+  };
+
   DISALLOW_COPY_AND_ASSIGN(ProfileSigninConfirmationViewControllerTest);
 };
 
 IN_PROC_BROWSER_TEST_F(ProfileSigninConfirmationViewControllerTest,
                        ContinueClicked) {
   SetupDialog();
 
   // Click should invoke and clear delegate and close the dialog.
   [controller_ ok:nil];
   EXPECT_TRUE(continued_);
@@ skipping 83 matching lines @@
   EXPECT_NSNE(nil, [controller_ createProfileButton]);
   EXPECT_TRUE([[[controller_ view] subviews]
                 containsObject:[controller_ createProfileButton]]);
   NSString* explanationWithCreateProfile = base::SysUTF16ToNSString(
       l10n_util::GetStringFUTF16(
           IDS_ENTERPRISE_SIGNIN_EXPLANATION_WITH_PROFILE_CREATION,
           base::UTF8ToUTF16(username()), learn_more()));
   EXPECT_NSEQ(explanationWithCreateProfile,
               [[[controller_ explanationField] textStorage] string]);
 }