Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(189)

Side by Side Diff: chrome/browser/password_manager/password_manager_test_base.cc

Issue 2926833002: Revert of [Password Manager] Convert |pending_login_managers_| to an array of scoped_refptr (Closed)
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/password_manager_test_base.h" 5 #include "chrome/browser/password_manager/password_manager_test_base.h"
6 6
7 #include <string> 7 #include <string>
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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 // ManagePasswordsUIController subclass to capture the UI events. 58 // ManagePasswordsUIController subclass to capture the UI events.
59 class CustomManagePasswordsUIController : public ManagePasswordsUIController { 59 class CustomManagePasswordsUIController : public ManagePasswordsUIController {
60 public: 60 public:
61 explicit CustomManagePasswordsUIController( 61 explicit CustomManagePasswordsUIController(
62 content::WebContents* web_contents); 62 content::WebContents* web_contents);
63 63
64 void WaitForState(password_manager::ui::State target_state); 64 void WaitForState(password_manager::ui::State target_state);
65 65
66 private: 66 private:
67 // PasswordsClientUIDelegate: 67 // PasswordsClientUIDelegate:
68 void OnPasswordSubmitted(scoped_refptr<password_manager::PasswordFormManager> 68 void OnPasswordSubmitted(
69 form_manager) override; 69 std::unique_ptr<password_manager::PasswordFormManager> form_manager)
70 override;
70 bool OnChooseCredentials( 71 bool OnChooseCredentials(
71 std::vector<std::unique_ptr<autofill::PasswordForm>> local_credentials, 72 std::vector<std::unique_ptr<autofill::PasswordForm>> local_credentials,
72 const GURL& origin, 73 const GURL& origin,
73 const ManagePasswordsState::CredentialsCallback& callback) override; 74 const ManagePasswordsState::CredentialsCallback& callback) override;
74 void OnPasswordAutofilled( 75 void OnPasswordAutofilled(
75 const std::map<base::string16, const autofill::PasswordForm*>& 76 const std::map<base::string16, const autofill::PasswordForm*>&
76 password_form_map, 77 password_form_map,
77 const GURL& origin, 78 const GURL& origin,
78 const std::vector<const autofill::PasswordForm*>* federated_matches) 79 const std::vector<const autofill::PasswordForm*>* federated_matches)
79 override; 80 override;
(...skipping 22 matching lines...) Expand all
102 103
103 void CustomManagePasswordsUIController::WaitForState( 104 void CustomManagePasswordsUIController::WaitForState(
104 password_manager::ui::State target_state) { 105 password_manager::ui::State target_state) {
105 base::RunLoop run_loop; 106 base::RunLoop run_loop;
106 target_state_ = target_state; 107 target_state_ = target_state;
107 run_loop_ = &run_loop; 108 run_loop_ = &run_loop;
108 run_loop_->Run(); 109 run_loop_->Run();
109 } 110 }
110 111
111 void CustomManagePasswordsUIController::OnPasswordSubmitted( 112 void CustomManagePasswordsUIController::OnPasswordSubmitted(
112 scoped_refptr<password_manager::PasswordFormManager> form_manager) { 113 std::unique_ptr<password_manager::PasswordFormManager> form_manager) {
113 if (target_state_ == password_manager::ui::PENDING_PASSWORD_STATE) { 114 if (target_state_ == password_manager::ui::PENDING_PASSWORD_STATE) {
114 run_loop_->Quit(); 115 run_loop_->Quit();
115 run_loop_ = nullptr; 116 run_loop_ = nullptr;
116 target_state_ = password_manager::ui::INACTIVE_STATE; 117 target_state_ = password_manager::ui::INACTIVE_STATE;
117 } 118 }
118 return ManagePasswordsUIController::OnPasswordSubmitted( 119 return ManagePasswordsUIController::OnPasswordSubmitted(
119 std::move(form_manager)); 120 std::move(form_manager));
120 } 121 }
121 122
122 bool CustomManagePasswordsUIController::OnChooseCredentials( 123 bool CustomManagePasswordsUIController::OnChooseCredentials(
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 488
488 content::BrowserThread::PostTaskAndReply( 489 content::BrowserThread::PostTaskAndReply(
489 content::BrowserThread::IO, FROM_HERE, 490 content::BrowserThread::IO, FROM_HERE,
490 base::BindOnce( 491 base::BindOnce(
491 &AddHSTSHostImpl, 492 &AddHSTSHostImpl,
492 make_scoped_refptr(browser()->profile()->GetRequestContext()), host), 493 make_scoped_refptr(browser()->profile()->GetRequestContext()), host),
493 run_loop.QuitClosure()); 494 run_loop.QuitClosure());
494 495
495 run_loop.Run(); 496 run_loop.Run();
496 } 497 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698