Merge 237115 "Security fix for untrusted signin confirm dialog"

chrome/browser/ui/cocoa/one_click_signin_dialog_controller_browsertest.mm

 // Copyright (c) 2013 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_dialog_controller.h"
 
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #import "chrome/browser/ui/cocoa/one_click_signin_view_controller.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ skipping 56 matching lines @@
 IN_PROC_BROWSER_TEST_F(OneClickSigninDialogControllerTest, Advanced) {
   [controller_->view_controller() onClickAdvancedLink:nil];
   EXPECT_EQ(OneClickSigninSyncStarter::CONFIGURE_SYNC_FIRST, sync_mode_);
   EXPECT_EQ(1, callback_count_);
 }
 
 // Test that the dialog calls the callback if the bubble is closed.
 // Callback should be called to setup sync with default settings.
 IN_PROC_BROWSER_TEST_F(OneClickSigninDialogControllerTest, Close) {
   controller_->constrained_window()->CloseWebContentsModalDialog();
-  EXPECT_EQ(OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS, sync_mode_);
+  EXPECT_EQ(OneClickSigninSyncStarter::UNDO_SYNC, sync_mode_);
   EXPECT_EQ(1, callback_count_);
 }
 
 // Test that clicking the learn more link opens a new window.
 IN_PROC_BROWSER_TEST_F(OneClickSigninDialogControllerTest, LearnMore) {
   EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
   [controller_->view_controller() textView:nil
                              clickedOnLink:nil
                                    atIndex:0];
   EXPECT_EQ(2u, chrome::GetTotalBrowserCount());
 }