[Smart Lock, UI] Change cancel button to Never, save prompt.

chrome/browser/password_manager/save_password_infobar_delegate_unittest.cc

 // Copyright 2015 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.
 
 #include "chrome/browser/password_manager/save_password_infobar_delegate.h"
 
 #include <string>
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 111 matching lines @@
 }
 
 void SavePasswordInfoBarDelegateTest::TearDown() {
   ChromeRenderViewHostTestHarness::TearDown();
 }
 
 TEST_F(SavePasswordInfoBarDelegateTest, CancelTestCredentialSourceAPI) {
   scoped_ptr<MockPasswordFormManager> password_form_manager(
       CreateMockFormManager());
   EXPECT_CALL(*password_form_manager.get(), PermanentlyBlacklist())
-      .Times(testing::Exactly(0));
+      .Times(testing::Exactly(1));

[vabr (Chromium), 2015/10/13 14:29:01]

nit: Times(1) is implicit, so you can drop the entire line 132.

[melandory, 2015/10/14 11:46:11]

Done.

   scoped_ptr<ConfirmInfoBarDelegate> infobar(CreateDelegate(
       password_form_manager.Pass(),
       password_manager::CredentialSourceType::CREDENTIAL_SOURCE_API, false));
   EXPECT_TRUE(infobar->Cancel());
 }
 
 TEST_F(SavePasswordInfoBarDelegateTest,
        CancelTestCredentialSourcePasswordManager) {
   scoped_ptr<MockPasswordFormManager> password_form_manager(
       CreateMockFormManager());
@@ skipping 32 matching lines @@
       CreateMockFormManager());
   scoped_ptr<ConfirmInfoBarDelegate> infobar(CreateDelegate(
       password_form_manager.Pass(), password_manager::CredentialSourceType::
                                         CREDENTIAL_SOURCE_PASSWORD_MANAGER,
       false));
   EXPECT_TRUE(infobar->Cancel());
   infobar.reset();
   EXPECT_FALSE(prefs()->GetBoolean(
       password_manager::prefs::kWasSavePrompFirstRunExperienceShown));
 }