Fix blacklisting for desktop infobars.

chrome/browser/password_manager/save_password_infobar_delegate_unittest.cc

Index: chrome/browser/password_manager/save_password_infobar_delegate_unittest.cc
diff --git a/chrome/browser/password_manager/save_password_infobar_delegate_unittest.cc b/chrome/browser/password_manager/save_password_infobar_delegate_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..46ee9c37b672c2287928fa5ea5f604e2fdfbb5f1
--- /dev/null
+++ b/chrome/browser/password_manager/save_password_infobar_delegate_unittest.cc
@@ -0,0 +1,96 @@
+// 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 "base/strings/utf_string_conversions.h"
+#include "chrome/browser/password_manager/save_password_infobar_delegate.h"
+#include "chrome/test/base/chrome_render_view_host_test_harness.h"
+#include "components/autofill/core/common/password_form.h"
+#include "components/password_manager/core/browser/password_form_manager.h"
+#include "components/password_manager/core/browser/password_manager_client.h"
+#include "components/password_manager/core/browser/stub_password_manager_client.h"
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+class MockPasswordFormManager : public password_manager::PasswordFormManager {
+ public:
+  MOCK_METHOD0(PermanentlyBlacklist, void());
+
+  MockPasswordFormManager(password_manager::StubPasswordManagerClient* client,
+                          autofill::PasswordForm form)

[vabr (Chromium), 2015/04/02 13:32:17]

const autofill::PasswordForm& ?

[melandory, 2015/04/02 15:49:17]

Done.

+      : PasswordFormManager(
+            nullptr,
+            client,
+            base::WeakPtr<password_manager::PasswordManagerDriver>(),
+            form,
+            false) {}
+
+  ~MockPasswordFormManager() override {}
+
+ private:

[vabr (Chromium), 2015/04/02 13:32:17]

Did you mean to add DISALLOW_COPY_AND_ASSIGN in the private section?
If not, please remove the section completely.

[melandory, 2015/04/02 15:49:17]

Done.

+};
+
+class SaveInfoBarDelegateTest : public ChromeRenderViewHostTestHarness {
+ public:
+  SaveInfoBarDelegateTest();
+  ~SaveInfoBarDelegateTest() override{};
+
+  void SetUp() override;
+  void TearDown() override;
+
+  autofill::PasswordForm test_form() { return test_form_; }

[vabr (Chromium), 2015/04/02 13:32:16]

Please make this return a const ref instead of the value.

[melandory, 2015/04/02 15:49:17]

Done.

+
+ protected:
+  scoped_ptr<ConfirmInfoBarDelegate> CreateDelegate(
+      password_manager::CredentialSourceType type);
+
+  password_manager::StubPasswordManagerClient client_;
+  scoped_ptr<MockPasswordFormManager> password_form_manager_;
+  autofill::PasswordForm test_form_;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(SaveInfoBarDelegateTest);
+};
+
+SaveInfoBarDelegateTest::SaveInfoBarDelegateTest() {
+  test_form_.origin = GURL("http://example.com");
+  test_form_.username_value = base::ASCIIToUTF16("username");
+  test_form_.password_value = base::ASCIIToUTF16("12345");
+}
+
+scoped_ptr<ConfirmInfoBarDelegate> SaveInfoBarDelegateTest::CreateDelegate(
+    password_manager::CredentialSourceType type) {
+  scoped_ptr<ConfirmInfoBarDelegate> delegate(
+      SavePasswordInfoBarDelegate::Create(password_form_manager_.Pass(), "",
+                                          type));
+  return delegate.Pass();
+}
+
+void SaveInfoBarDelegateTest::SetUp() {
+  ChromeRenderViewHostTestHarness::SetUp();
+  password_form_manager_.reset(

[vabr (Chromium), 2015/04/02 13:32:17]

Instead of keeping this as a member variable, please create a helper method,
which will return the manager:
scoped_ptr<MockPasswordFormManager> CreateMockFormManager()

Then, add an explicit scoped_ptr<PasswordFormManager> argument to
SaveInfoBarDelegateTest::CreateDelegate() to make it clear, which form manager
it uses.

The current state hides the fact that after the first call to CreateDelegate,
the member-variable scoped_ptr<MockPasswordFormManager> becomes null.

[melandory, 2015/04/02 15:49:17]

I've created helper function which returns raw pointer with explanation who owns
it.

+      new MockPasswordFormManager(&client_, test_form()));
+}
+
+void SaveInfoBarDelegateTest::TearDown() {
+  ChromeRenderViewHostTestHarness::TearDown();
+}
+
+TEST_F(SaveInfoBarDelegateTest, CancelTestCredentialSourceAPI) {
+  MockPasswordFormManager* password_form_manager = password_form_manager_.get();
+  scoped_ptr<ConfirmInfoBarDelegate> infobar(CreateDelegate(
+      password_manager::CredentialSourceType::CREDENTIAL_SOURCE_API));
+  EXPECT_CALL(*password_form_manager, PermanentlyBlacklist())
+      .Times(testing::Exactly(0));
+  EXPECT_TRUE(infobar->Cancel());
+}
+
+TEST_F(SaveInfoBarDelegateTest, CancelTestCredentialSourcePasswordManager) {
+  MockPasswordFormManager* password_form_manager = password_form_manager_.get();
+  scoped_ptr<ConfirmInfoBarDelegate> infobar(
+      CreateDelegate(password_manager::CredentialSourceType::
+                         CREDENTIAL_SOURCE_PASSWORD_MANAGER));
+  EXPECT_CALL(*password_form_manager, PermanentlyBlacklist())
+      .Times(testing::Exactly(1));
+  EXPECT_TRUE(infobar->Cancel());
+}