OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/ui/passwords/manage_passwords_test.h" | 5 #include "chrome/browser/ui/passwords/manage_passwords_test.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/memory/ptr_util.h" |
10 #include "base/strings/utf_string_conversions.h" | 11 #include "base/strings/utf_string_conversions.h" |
11 #include "chrome/app/chrome_command_ids.h" | 12 #include "chrome/app/chrome_command_ids.h" |
12 #include "chrome/browser/ui/browser.h" | 13 #include "chrome/browser/ui/browser.h" |
13 #include "chrome/browser/ui/browser_command_controller.h" | 14 #include "chrome/browser/ui/browser_command_controller.h" |
14 #include "chrome/browser/ui/browser_window.h" | 15 #include "chrome/browser/ui/browser_window.h" |
15 #include "chrome/browser/ui/passwords/passwords_client_ui_delegate.h" | 16 #include "chrome/browser/ui/passwords/passwords_client_ui_delegate.h" |
16 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 17 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
17 #include "chrome/test/base/in_process_browser_test.h" | 18 #include "chrome/test/base/in_process_browser_test.h" |
18 #include "chrome/test/base/interactive_test_utils.h" | 19 #include "chrome/test/base/interactive_test_utils.h" |
19 #include "components/autofill/core/common/password_form.h" | 20 #include "components/autofill/core/common/password_form.h" |
(...skipping 22 matching lines...) Expand all Loading... |
42 | 43 |
43 // Wait for the command execution to pop up the bubble. | 44 // Wait for the command execution to pop up the bubble. |
44 content::RunAllPendingInMessageLoop(); | 45 content::RunAllPendingInMessageLoop(); |
45 } | 46 } |
46 | 47 |
47 void ManagePasswordsTest::SetupManagingPasswords() { | 48 void ManagePasswordsTest::SetupManagingPasswords() { |
48 base::string16 kTestUsername = base::ASCIIToUTF16("test_username"); | 49 base::string16 kTestUsername = base::ASCIIToUTF16("test_username"); |
49 autofill::PasswordFormMap map; | 50 autofill::PasswordFormMap map; |
50 map.insert(std::make_pair( | 51 map.insert(std::make_pair( |
51 kTestUsername, | 52 kTestUsername, |
52 make_scoped_ptr(new autofill::PasswordForm(*test_form())))); | 53 base::WrapUnique(new autofill::PasswordForm(*test_form())))); |
53 GetController()->OnPasswordAutofilled(map, map.begin()->second->origin, | 54 GetController()->OnPasswordAutofilled(map, map.begin()->second->origin, |
54 nullptr); | 55 nullptr); |
55 } | 56 } |
56 | 57 |
57 void ManagePasswordsTest::SetupPendingPassword() { | 58 void ManagePasswordsTest::SetupPendingPassword() { |
58 password_manager::StubPasswordManagerClient client; | 59 password_manager::StubPasswordManagerClient client; |
59 password_manager::StubLogManager log_manager; | 60 password_manager::StubLogManager log_manager; |
60 password_manager::StubPasswordManagerDriver driver; | 61 password_manager::StubPasswordManagerDriver driver; |
61 | 62 |
62 scoped_ptr<password_manager::PasswordFormManager> test_form_manager( | 63 std::unique_ptr<password_manager::PasswordFormManager> test_form_manager( |
63 new password_manager::PasswordFormManager( | 64 new password_manager::PasswordFormManager( |
64 nullptr, &client, driver.AsWeakPtr(), *test_form(), false)); | 65 nullptr, &client, driver.AsWeakPtr(), *test_form(), false)); |
65 test_form_manager->SimulateFetchMatchingLoginsFromPasswordStore(); | 66 test_form_manager->SimulateFetchMatchingLoginsFromPasswordStore(); |
66 ScopedVector<autofill::PasswordForm> best_matches; | 67 ScopedVector<autofill::PasswordForm> best_matches; |
67 test_form_manager->OnGetPasswordStoreResults(std::move(best_matches)); | 68 test_form_manager->OnGetPasswordStoreResults(std::move(best_matches)); |
68 GetController()->OnPasswordSubmitted(std::move(test_form_manager)); | 69 GetController()->OnPasswordSubmitted(std::move(test_form_manager)); |
69 } | 70 } |
70 | 71 |
71 void ManagePasswordsTest::SetupAutomaticPassword() { | 72 void ManagePasswordsTest::SetupAutomaticPassword() { |
72 password_manager::StubPasswordManagerClient client; | 73 password_manager::StubPasswordManagerClient client; |
73 password_manager::StubLogManager log_manager; | 74 password_manager::StubLogManager log_manager; |
74 password_manager::StubPasswordManagerDriver driver; | 75 password_manager::StubPasswordManagerDriver driver; |
75 | 76 |
76 scoped_ptr<password_manager::PasswordFormManager> test_form_manager( | 77 std::unique_ptr<password_manager::PasswordFormManager> test_form_manager( |
77 new password_manager::PasswordFormManager( | 78 new password_manager::PasswordFormManager( |
78 nullptr, &client, driver.AsWeakPtr(), *test_form(), false)); | 79 nullptr, &client, driver.AsWeakPtr(), *test_form(), false)); |
79 GetController()->OnAutomaticPasswordSave(std::move(test_form_manager)); | 80 GetController()->OnAutomaticPasswordSave(std::move(test_form_manager)); |
80 } | 81 } |
81 | 82 |
82 void ManagePasswordsTest::SetupAutoSignin( | 83 void ManagePasswordsTest::SetupAutoSignin( |
83 ScopedVector<autofill::PasswordForm> local_credentials) { | 84 ScopedVector<autofill::PasswordForm> local_credentials) { |
84 ASSERT_FALSE(local_credentials.empty()); | 85 ASSERT_FALSE(local_credentials.empty()); |
85 GURL origin = local_credentials[0]->origin; | 86 GURL origin = local_credentials[0]->origin; |
86 GetController()->OnAutoSignin(std::move(local_credentials), origin); | 87 GetController()->OnAutoSignin(std::move(local_credentials), origin); |
87 } | 88 } |
88 | 89 |
89 scoped_ptr<base::HistogramSamples> ManagePasswordsTest::GetSamples( | 90 std::unique_ptr<base::HistogramSamples> ManagePasswordsTest::GetSamples( |
90 const char* histogram) { | 91 const char* histogram) { |
91 // Ensure that everything has been properly recorded before pulling samples. | 92 // Ensure that everything has been properly recorded before pulling samples. |
92 content::RunAllPendingInMessageLoop(); | 93 content::RunAllPendingInMessageLoop(); |
93 return histogram_tester_.GetHistogramSamplesSinceCreation(histogram); | 94 return histogram_tester_.GetHistogramSamplesSinceCreation(histogram); |
94 } | 95 } |
95 | 96 |
96 PasswordsClientUIDelegate* ManagePasswordsTest::GetController() { | 97 PasswordsClientUIDelegate* ManagePasswordsTest::GetController() { |
97 return PasswordsClientUIDelegateFromWebContents( | 98 return PasswordsClientUIDelegateFromWebContents( |
98 browser()->tab_strip_model()->GetActiveWebContents()); | 99 browser()->tab_strip_model()->GetActiveWebContents()); |
99 } | 100 } |
OLD | NEW |