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

Side by Side Diff: components/password_manager/content/browser/content_credential_manager_dispatcher_unittest.cc

Issue 877613004: [Credential Manager API] Pass origin to Account chooser UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@local_vs_federated
Patch Set: Created 5 years, 10 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 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 "components/password_manager/content/browser/credential_manager_dispatc her.h" 5 #include "components/password_manager/content/browser/credential_manager_dispatc her.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 bool PromptUserToSavePassword( 47 bool PromptUserToSavePassword(
48 scoped_ptr<password_manager::PasswordFormManager> manager) override { 48 scoped_ptr<password_manager::PasswordFormManager> manager) override {
49 did_prompt_user_to_save_ = true; 49 did_prompt_user_to_save_ = true;
50 manager_.reset(manager.release()); 50 manager_.reset(manager.release());
51 return true; 51 return true;
52 } 52 }
53 53
54 bool PromptUserToChooseCredentials( 54 bool PromptUserToChooseCredentials(
55 const std::vector<autofill::PasswordForm*>& local_forms, 55 const std::vector<autofill::PasswordForm*>& local_forms,
56 const std::vector<autofill::PasswordForm*>& federated_forms, 56 const std::vector<autofill::PasswordForm*>& federated_forms,
57 const GURL& origin,
57 base::Callback<void(const password_manager::CredentialInfo&)> callback) 58 base::Callback<void(const password_manager::CredentialInfo&)> callback)
58 override { 59 override {
59 // TODO(melandory): Use ScopedVector instead of std::vector in arguments. 60 // TODO(melandory): Use ScopedVector instead of std::vector in arguments.
60 // ContentCredentialManagerDispatcher::OnGetPasswordStoreResults contains a 61 // ContentCredentialManagerDispatcher::OnGetPasswordStoreResults contains a
61 // memory leak because of this. 62 // memory leak because of this.
62 EXPECT_FALSE(local_forms.empty() && federated_forms.empty()); 63 EXPECT_FALSE(local_forms.empty() && federated_forms.empty());
63 did_prompt_user_to_choose_ = true; 64 did_prompt_user_to_choose_ = true;
64 ScopedVector<autofill::PasswordForm> local_entries; 65 ScopedVector<autofill::PasswordForm> local_entries;
65 local_entries.assign(local_forms.begin(), local_forms.end()); 66 local_entries.assign(local_forms.begin(), local_forms.end());
66 ScopedVector<autofill::PasswordForm> federated_entries; 67 ScopedVector<autofill::PasswordForm> federated_entries;
67 federated_entries.assign(federated_forms.begin(), federated_forms.end()); 68 federated_entries.assign(federated_forms.begin(), federated_forms.end());
68 password_manager::CredentialInfo info( 69 password_manager::CredentialInfo info(
69 local_forms.empty() ? *federated_forms[0] : *local_entries[0], 70 local_forms.empty() ? *federated_forms[0] : *local_forms[0],
Mike West 2015/02/02 14:38:24 Good catch.
70 local_forms.empty() 71 local_forms.empty()
71 ? password_manager::CredentialType::CREDENTIAL_TYPE_FEDERATED 72 ? password_manager::CredentialType::CREDENTIAL_TYPE_FEDERATED
72 : password_manager::CredentialType::CREDENTIAL_TYPE_LOCAL); 73 : password_manager::CredentialType::CREDENTIAL_TYPE_LOCAL);
73 base::MessageLoop::current()->PostTask(FROM_HERE, 74 base::MessageLoop::current()->PostTask(FROM_HERE,
74 base::Bind(callback, info)); 75 base::Bind(callback, info));
75 return true; 76 return true;
76 } 77 }
77 78
78 bool IsOffTheRecord() override { return is_off_the_record_; } 79 bool IsOffTheRecord() override { return is_off_the_record_; }
79 bool IsZeroClickEnabled() override { return is_zero_click_enabled_; } 80 bool IsZeroClickEnabled() override { return is_zero_click_enabled_; }
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 const IPC::Message* message = 427 const IPC::Message* message =
427 process()->sink().GetFirstMessageMatching(kMsgID); 428 process()->sink().GetFirstMessageMatching(kMsgID);
428 ASSERT_TRUE(message); 429 ASSERT_TRUE(message);
429 CredentialManagerMsg_SendCredential::Param param; 430 CredentialManagerMsg_SendCredential::Param param;
430 CredentialManagerMsg_SendCredential::Read(message, &param); 431 CredentialManagerMsg_SendCredential::Read(message, &param);
431 EXPECT_EQ(CredentialType::CREDENTIAL_TYPE_EMPTY, get<1>(param).type); 432 EXPECT_EQ(CredentialType::CREDENTIAL_TYPE_EMPTY, get<1>(param).type);
432 EXPECT_FALSE(client_->did_prompt_user_to_choose()); 433 EXPECT_FALSE(client_->did_prompt_user_to_choose());
433 } 434 }
434 435
435 } // namespace password_manager 436 } // namespace password_manager
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698