Mac: Display a native bubble (instead of the JS one) after the web signin flow. (branched from http…

chrome/browser/ui/cocoa/one_click_signin_bubble_controller_unittest.mm

 // Copyright (c) 2012 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/one_click_signin_bubble_controller.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 18 matching lines @@
         start_sync_callback_(
             base::Bind(&OneClickSigninBubbleControllerTest::OnStartSync,
                        weak_ptr_factory_.GetWeakPtr())) {}
 
   virtual void SetUp() OVERRIDE {
     CocoaProfileTest::SetUp();
     BrowserWindowCocoa* browser_window =
         static_cast<BrowserWindowCocoa*>(browser()->window());
     controller_.reset([[OneClickSigninBubbleController alloc]
             initWithBrowserWindowController:browser_window->cocoa_controller()
+                                webContents:nil
+                               errorMessage:nil
                                    callback:start_sync_callback_]);
     [controller_ showWindow:nil];
     EXPECT_NSEQ(@"OneClickSigninBubble",
                 [[controller_ viewController] nibName]);
   }
 
   virtual void TearDown() OVERRIDE {
     controller_.reset();
     CocoaProfileTest::TearDown();
   }
 
   MOCK_METHOD1(OnStartSync, void(OneClickSigninSyncStarter::StartSyncMode));
 
  protected:
   base::WeakPtrFactory<OneClickSigninBubbleControllerTest> weak_ptr_factory_;
   BrowserWindow::StartSyncCallback start_sync_callback_;
   scoped_nsobject<OneClickSigninBubbleController> controller_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(OneClickSigninBubbleControllerTest);
 };
 
-// Test that the bubble calls the callback if the OK button is clicked.
-// Callback should be called to setup sync with default settings.
+// Test that the bubble does not sync if the OK button is clicked.
 TEST_F(OneClickSigninBubbleControllerTest, OK) {
   EXPECT_CALL(*this, OnStartSync(
-      OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS));
+      OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS)).Times(0);
   [[controller_ viewController] ok:nil];
 }
 
-// Test that the dialog calls the callback if the Undo button
+// Test that the bubble does not sync if the Undo button
 // is clicked. Callback should be called to abort the sync.
 TEST_F(OneClickSigninBubbleControllerTest, Undo) {
   EXPECT_CALL(*this, OnStartSync(
-      OneClickSigninSyncStarter::UNDO_SYNC)).Times(1);
+      OneClickSigninSyncStarter::UNDO_SYNC)).Times(0);
   [[controller_ viewController] onClickUndo:nil];
 }
 
-// Test that the advanced callback is run if its corresponding button
-// is clicked.
-TEST_F(OneClickSigninBubbleControllerTest, Advanced) {

[Alexei Svitkine (slow), 2013/04/23 19:43:24]

Why is this test being deleted?

[noms (inactive), 2013/04/24 14:49:30]

The new code for the Advanced link event handler opens a new tab, which isn't
possible in a unit test. I've added an entire class of browser tests to deal
with this.

On 2013/04/23 19:43:24, Alexei Svitkine wrote:

-  EXPECT_CALL(*this, OnStartSync(
-      OneClickSigninSyncStarter::CONFIGURE_SYNC_FIRST));
-  [[controller_ viewController] onClickAdvancedLink:nil];
-}
-
-// Test that the bubble calls the callback if the bubble is closed.
-// Callback should be called to setup sync with default settings.
+// Test that the bubble does not sync if the bubble is closed.
 TEST_F(OneClickSigninBubbleControllerTest, Close) {
   EXPECT_CALL(*this, OnStartSync(
-      OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS));
+      OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS)).Times(0);
   [controller_ close];
 }
 
 }  // namespace