Merge 237115 "Security fix for untrusted signin confirm dialog"

chrome/browser/ui/cocoa/one_click_signin_view_controller.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_view_controller.h"
 
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #import "chrome/browser/ui/chrome_style.h"
@@ skipping 49 matching lines @@
   }
   return self;
 }
 
 - (void)viewWillClose {
   // This is usually called after a click handler has initiated sync
   // and has reset the callback. However, in the case that we are closing
   // the window and nothing else has initiated the sync, we must do so here
   if (isSyncDialog_ && !startSyncCallback_.is_null()) {
     base::ResetAndReturn(&startSyncCallback_).Run(
-        OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS);
+        OneClickSigninSyncStarter::UNDO_SYNC);
   }
 }
 
 - (IBAction)ok:(id)sender {
   if (isSyncDialog_) {
     OneClickSigninHelper::LogConfirmHistogramValue(
         clickedLearnMore_ ?
             one_click_signin::HISTOGRAM_CONFIRM_LEARN_MORE_OK :
             one_click_signin::HISTOGRAM_CONFIRM_OK);
 
@@ skipping 177 matching lines @@
                                 content::PAGE_TRANSITION_LINK, false);
   webContents_->OpenURL(params);
   return YES;
 }
 
 - (void)close {
   base::ResetAndReturn(&closeCallback_).Run();
 }
 
 @end