OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/password_manager/save_password_infobar_delegate.h" | 5 #include "chrome/browser/password_manager/save_password_infobar_delegate.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
| 8 #include <utility> |
8 | 9 |
9 #include "base/macros.h" | 10 #include "base/macros.h" |
10 #include "base/prefs/pref_service.h" | 11 #include "base/prefs/pref_service.h" |
11 #include "base/strings/utf_string_conversions.h" | 12 #include "base/strings/utf_string_conversions.h" |
12 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
13 #include "chrome/test/base/chrome_render_view_host_test_harness.h" | 14 #include "chrome/test/base/chrome_render_view_host_test_harness.h" |
14 #include "components/autofill/core/common/password_form.h" | 15 #include "components/autofill/core/common/password_form.h" |
15 #include "components/password_manager/core/browser/password_form_manager.h" | 16 #include "components/password_manager/core/browser/password_form_manager.h" |
16 #include "components/password_manager/core/browser/password_manager.h" | 17 #include "components/password_manager/core/browser/password_manager.h" |
17 #include "components/password_manager/core/browser/stub_password_manager_client.
h" | 18 #include "components/password_manager/core/browser/stub_password_manager_client.
h" |
(...skipping 23 matching lines...) Expand all Loading... |
41 }; | 42 }; |
42 | 43 |
43 class TestSavePasswordInfobarDelegate : public SavePasswordInfoBarDelegate { | 44 class TestSavePasswordInfobarDelegate : public SavePasswordInfoBarDelegate { |
44 public: | 45 public: |
45 TestSavePasswordInfobarDelegate( | 46 TestSavePasswordInfobarDelegate( |
46 content::WebContents* web_contents, | 47 content::WebContents* web_contents, |
47 scoped_ptr<password_manager::PasswordFormManager> form_to_save, | 48 scoped_ptr<password_manager::PasswordFormManager> form_to_save, |
48 password_manager::CredentialSourceType source_type, | 49 password_manager::CredentialSourceType source_type, |
49 bool should_show_first_run_experience) | 50 bool should_show_first_run_experience) |
50 : SavePasswordInfoBarDelegate(web_contents, | 51 : SavePasswordInfoBarDelegate(web_contents, |
51 form_to_save.Pass(), | 52 std::move(form_to_save), |
52 std::string(), | 53 std::string(), |
53 source_type, | 54 source_type, |
54 true /* is_smartlock_branding_enabled */, | 55 true /* is_smartlock_branding_enabled */, |
55 should_show_first_run_experience) {} | 56 should_show_first_run_experience) {} |
56 | 57 |
57 ~TestSavePasswordInfobarDelegate() override {} | 58 ~TestSavePasswordInfobarDelegate() override {} |
58 }; | 59 }; |
59 | 60 |
60 } // namespace | 61 } // namespace |
61 | 62 |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
105 return scoped_ptr<MockPasswordFormManager>(new MockPasswordFormManager( | 106 return scoped_ptr<MockPasswordFormManager>(new MockPasswordFormManager( |
106 &password_manager_, &client_, driver_.AsWeakPtr(), test_form())); | 107 &password_manager_, &client_, driver_.AsWeakPtr(), test_form())); |
107 } | 108 } |
108 | 109 |
109 scoped_ptr<ConfirmInfoBarDelegate> | 110 scoped_ptr<ConfirmInfoBarDelegate> |
110 SavePasswordInfoBarDelegateTest::CreateDelegate( | 111 SavePasswordInfoBarDelegateTest::CreateDelegate( |
111 scoped_ptr<password_manager::PasswordFormManager> password_form_manager, | 112 scoped_ptr<password_manager::PasswordFormManager> password_form_manager, |
112 password_manager::CredentialSourceType type, | 113 password_manager::CredentialSourceType type, |
113 bool should_show_first_run_experience) { | 114 bool should_show_first_run_experience) { |
114 scoped_ptr<ConfirmInfoBarDelegate> delegate( | 115 scoped_ptr<ConfirmInfoBarDelegate> delegate( |
115 new TestSavePasswordInfobarDelegate(web_contents(), | 116 new TestSavePasswordInfobarDelegate( |
116 password_form_manager.Pass(), type, | 117 web_contents(), std::move(password_form_manager), type, |
117 should_show_first_run_experience)); | 118 should_show_first_run_experience)); |
118 return delegate.Pass(); | 119 return delegate; |
119 } | 120 } |
120 | 121 |
121 void SavePasswordInfoBarDelegateTest::SetUp() { | 122 void SavePasswordInfoBarDelegateTest::SetUp() { |
122 ChromeRenderViewHostTestHarness::SetUp(); | 123 ChromeRenderViewHostTestHarness::SetUp(); |
123 } | 124 } |
124 | 125 |
125 void SavePasswordInfoBarDelegateTest::TearDown() { | 126 void SavePasswordInfoBarDelegateTest::TearDown() { |
126 ChromeRenderViewHostTestHarness::TearDown(); | 127 ChromeRenderViewHostTestHarness::TearDown(); |
127 } | 128 } |
128 | 129 |
129 TEST_F(SavePasswordInfoBarDelegateTest, CancelTestCredentialSourceAPI) { | 130 TEST_F(SavePasswordInfoBarDelegateTest, CancelTestCredentialSourceAPI) { |
130 scoped_ptr<MockPasswordFormManager> password_form_manager( | 131 scoped_ptr<MockPasswordFormManager> password_form_manager( |
131 CreateMockFormManager()); | 132 CreateMockFormManager()); |
132 EXPECT_CALL(*password_form_manager.get(), PermanentlyBlacklist()); | 133 EXPECT_CALL(*password_form_manager.get(), PermanentlyBlacklist()); |
133 scoped_ptr<ConfirmInfoBarDelegate> infobar(CreateDelegate( | 134 scoped_ptr<ConfirmInfoBarDelegate> infobar(CreateDelegate( |
134 password_form_manager.Pass(), | 135 std::move(password_form_manager), |
135 password_manager::CredentialSourceType::CREDENTIAL_SOURCE_API, false)); | 136 password_manager::CredentialSourceType::CREDENTIAL_SOURCE_API, false)); |
136 EXPECT_TRUE(infobar->Cancel()); | 137 EXPECT_TRUE(infobar->Cancel()); |
137 } | 138 } |
138 | 139 |
139 TEST_F(SavePasswordInfoBarDelegateTest, | 140 TEST_F(SavePasswordInfoBarDelegateTest, |
140 CancelTestCredentialSourcePasswordManager) { | 141 CancelTestCredentialSourcePasswordManager) { |
141 scoped_ptr<MockPasswordFormManager> password_form_manager( | 142 scoped_ptr<MockPasswordFormManager> password_form_manager( |
142 CreateMockFormManager()); | 143 CreateMockFormManager()); |
143 EXPECT_CALL(*password_form_manager.get(), PermanentlyBlacklist()); | 144 EXPECT_CALL(*password_form_manager.get(), PermanentlyBlacklist()); |
144 scoped_ptr<ConfirmInfoBarDelegate> infobar(CreateDelegate( | 145 scoped_ptr<ConfirmInfoBarDelegate> infobar(CreateDelegate( |
145 password_form_manager.Pass(), password_manager::CredentialSourceType:: | 146 std::move(password_form_manager), password_manager::CredentialSourceType:: |
146 CREDENTIAL_SOURCE_PASSWORD_MANAGER, | 147 CREDENTIAL_SOURCE_PASSWORD_MANAGER, |
147 false)); | 148 false)); |
148 EXPECT_TRUE(infobar->Cancel()); | 149 EXPECT_TRUE(infobar->Cancel()); |
149 } | 150 } |
150 | 151 |
151 TEST_F(SavePasswordInfoBarDelegateTest, | 152 TEST_F(SavePasswordInfoBarDelegateTest, |
152 CheckResetOfPrefAfterFirstRunMessageWasShown) { | 153 CheckResetOfPrefAfterFirstRunMessageWasShown) { |
153 using password_manager::CredentialSourceType; | 154 using password_manager::CredentialSourceType; |
154 prefs()->SetBoolean( | 155 prefs()->SetBoolean( |
155 password_manager::prefs::kWasSavePrompFirstRunExperienceShown, false); | 156 password_manager::prefs::kWasSavePrompFirstRunExperienceShown, false); |
156 scoped_ptr<MockPasswordFormManager> password_form_manager( | 157 scoped_ptr<MockPasswordFormManager> password_form_manager( |
157 CreateMockFormManager()); | 158 CreateMockFormManager()); |
158 scoped_ptr<ConfirmInfoBarDelegate> infobar(CreateDelegate( | 159 scoped_ptr<ConfirmInfoBarDelegate> infobar(CreateDelegate( |
159 password_form_manager.Pass(), password_manager::CredentialSourceType:: | 160 std::move(password_form_manager), password_manager::CredentialSourceType:: |
160 CREDENTIAL_SOURCE_PASSWORD_MANAGER, | 161 CREDENTIAL_SOURCE_PASSWORD_MANAGER, |
161 true)); | 162 true)); |
162 EXPECT_TRUE(infobar->Cancel()); | 163 EXPECT_TRUE(infobar->Cancel()); |
163 infobar.reset(); | 164 infobar.reset(); |
164 EXPECT_TRUE(prefs()->GetBoolean( | 165 EXPECT_TRUE(prefs()->GetBoolean( |
165 password_manager::prefs::kWasSavePrompFirstRunExperienceShown)); | 166 password_manager::prefs::kWasSavePrompFirstRunExperienceShown)); |
166 } | 167 } |
167 | 168 |
168 TEST_F(SavePasswordInfoBarDelegateTest, | 169 TEST_F(SavePasswordInfoBarDelegateTest, |
169 CheckNoStateOfPrefChangeWhenNoFirstRunExperienceShown) { | 170 CheckNoStateOfPrefChangeWhenNoFirstRunExperienceShown) { |
170 using password_manager::CredentialSourceType; | 171 using password_manager::CredentialSourceType; |
171 prefs()->SetBoolean( | 172 prefs()->SetBoolean( |
172 password_manager::prefs::kWasSavePrompFirstRunExperienceShown, false); | 173 password_manager::prefs::kWasSavePrompFirstRunExperienceShown, false); |
173 scoped_ptr<MockPasswordFormManager> password_form_manager( | 174 scoped_ptr<MockPasswordFormManager> password_form_manager( |
174 CreateMockFormManager()); | 175 CreateMockFormManager()); |
175 scoped_ptr<ConfirmInfoBarDelegate> infobar(CreateDelegate( | 176 scoped_ptr<ConfirmInfoBarDelegate> infobar(CreateDelegate( |
176 password_form_manager.Pass(), password_manager::CredentialSourceType:: | 177 std::move(password_form_manager), password_manager::CredentialSourceType:: |
177 CREDENTIAL_SOURCE_PASSWORD_MANAGER, | 178 CREDENTIAL_SOURCE_PASSWORD_MANAGER, |
178 false)); | 179 false)); |
179 EXPECT_TRUE(infobar->Cancel()); | 180 EXPECT_TRUE(infobar->Cancel()); |
180 infobar.reset(); | 181 infobar.reset(); |
181 EXPECT_FALSE(prefs()->GetBoolean( | 182 EXPECT_FALSE(prefs()->GetBoolean( |
182 password_manager::prefs::kWasSavePrompFirstRunExperienceShown)); | 183 password_manager::prefs::kWasSavePrompFirstRunExperienceShown)); |
183 } | 184 } |
OLD | NEW |