OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "components/password_manager/core/browser/credential_manager_password_f
orm_manager.h" | 5 #include "components/password_manager/core/browser/credential_manager_password_f
orm_manager.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 | 8 |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 StubPasswordManagerClient client_; | 43 StubPasswordManagerClient client_; |
44 StubPasswordManagerDriver driver_; | 44 StubPasswordManagerDriver driver_; |
45 | 45 |
46 DISALLOW_COPY_AND_ASSIGN(CredentialManagerPasswordFormManagerTest); | 46 DISALLOW_COPY_AND_ASSIGN(CredentialManagerPasswordFormManagerTest); |
47 }; | 47 }; |
48 | 48 |
49 // Test that aborting early does not cause use after free. | 49 // Test that aborting early does not cause use after free. |
50 TEST_F(CredentialManagerPasswordFormManagerTest, AbortEarly) { | 50 TEST_F(CredentialManagerPasswordFormManagerTest, AbortEarly) { |
51 PasswordForm observed_form; | 51 PasswordForm observed_form; |
52 MockDelegate delegate; | 52 MockDelegate delegate; |
53 auto form_manager = base::MakeUnique<CredentialManagerPasswordFormManager>( | 53 auto form_manager = |
54 &client_, driver_.AsWeakPtr(), observed_form, | 54 base::MakeRefCounted<CredentialManagerPasswordFormManager>( |
55 base::MakeUnique<PasswordForm>(observed_form), &delegate, | 55 &client_, driver_.AsWeakPtr(), observed_form, |
56 base::MakeUnique<StubFormSaver>(), base::MakeUnique<FakeFormFetcher>()); | 56 base::MakeUnique<PasswordForm>(observed_form), &delegate, |
| 57 base::MakeUnique<StubFormSaver>(), |
| 58 base::MakeUnique<FakeFormFetcher>()); |
57 | 59 |
58 auto deleter = [&form_manager]() { form_manager.reset(); }; | 60 auto deleter = [&form_manager]() { form_manager = nullptr; }; |
59 | 61 |
60 // Simulate that the PasswordStore responded to the FormFetcher. As a result, | 62 // Simulate that the PasswordStore responded to the FormFetcher. As a result, |
61 // |form_manager| should call the delegate's OnProvisionalSaveComplete, which | 63 // |form_manager| should call the delegate's OnProvisionalSaveComplete, which |
62 // in turn should delete |form_fetcher|. | 64 // in turn should delete |form_fetcher|. |
63 EXPECT_CALL(delegate, OnProvisionalSaveComplete()).WillOnce(Invoke(deleter)); | 65 EXPECT_CALL(delegate, OnProvisionalSaveComplete()).WillOnce(Invoke(deleter)); |
64 static_cast<FakeFormFetcher*>(form_manager->form_fetcher()) | 66 static_cast<FakeFormFetcher*>(form_manager->form_fetcher()) |
65 ->SetNonFederated(std::vector<const PasswordForm*>(), 0u); | 67 ->SetNonFederated(std::vector<const PasswordForm*>(), 0u); |
66 // Check that |form_manager| was not deleted yet; doing so would have caused | 68 // Check that |form_manager| was not deleted yet; doing so would have caused |
67 // use after free during SetNonFederated. | 69 // use after free during SetNonFederated. |
68 EXPECT_TRUE(form_manager); | 70 EXPECT_TRUE(form_manager); |
69 | 71 |
70 base::RunLoop().RunUntilIdle(); | 72 base::RunLoop().RunUntilIdle(); |
71 | 73 |
72 // Ultimately, |form_fetcher| should have been deleted. It just should happen | 74 // Ultimately, |form_fetcher| should have been deleted. It just should happen |
73 // after it finishes executing. | 75 // after it finishes executing. |
74 EXPECT_FALSE(form_manager); | 76 EXPECT_FALSE(form_manager); |
75 } | 77 } |
76 | 78 |
77 } // namespace password_manager | 79 } // namespace password_manager |
OLD | NEW |