Credential Manager: Return the first valid item from the PasswordStore.

components/password_manager/content/browser/content_credential_manager_dispatcher_unittest.cc

Index: components/password_manager/content/browser/content_credential_manager_dispatcher_unittest.cc
diff --git a/components/password_manager/content/browser/content_credential_manager_dispatcher_unittest.cc b/components/password_manager/content/browser/content_credential_manager_dispatcher_unittest.cc
index d98ee9040ed4e35284e77e855bcd9709ed679c27..262538daddffa87d79c8c42c943a140ac81da8ab 100644
--- a/components/password_manager/content/browser/content_credential_manager_dispatcher_unittest.cc
+++ b/components/password_manager/content/browser/content_credential_manager_dispatcher_unittest.cc
@@ -12,6 +12,7 @@
 #include "components/password_manager/content/common/credential_manager_types.h"
 #include "components/password_manager/core/browser/stub_password_manager_client.h"
 #include "components/password_manager/core/browser/test_password_store.h"
+#include "content/public/browser/web_contents.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_renderer_host.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -62,6 +63,15 @@ class ContentCredentialManagerDispatcherTest
     client_.reset(new TestPasswordManagerClient(store_.get()));
     dispatcher_.reset(
         new ContentCredentialManagerDispatcher(web_contents(), client_.get()));
+
+    NavigateAndCommit(GURL("https://example.com/test.html"));
+
+    form_.username_value = base::ASCIIToUTF16("Username");
+    form_.display_name = base::ASCIIToUTF16("Display Name");
+    form_.password_value = base::ASCIIToUTF16("Password");
+    form_.origin = web_contents()->GetLastCommittedURL().GetOrigin();
+    form_.signon_realm = form_.origin.spec();
+    form_.scheme = autofill::PasswordForm::SCHEME_HTML;
   }
 
   virtual void TearDown() OVERRIDE {
@@ -71,7 +81,8 @@ class ContentCredentialManagerDispatcherTest
 
   ContentCredentialManagerDispatcher* dispatcher() { return dispatcher_.get(); }
 
- private:
+ protected:
+  autofill::PasswordForm form_;
   scoped_refptr<TestPasswordStore> store_;
   scoped_ptr<ContentCredentialManagerDispatcher> dispatcher_;
   scoped_ptr<TestPasswordManagerClient> client_;
@@ -117,7 +128,23 @@ TEST_F(ContentCredentialManagerDispatcherTest,
 }
 
 TEST_F(ContentCredentialManagerDispatcherTest,
-       CredentialManagerOnRequestCredential) {
+       CredentialManagerOnRequestCredentialWithEmptyPasswordStore) {
+  std::vector<GURL> federations;
+  dispatcher()->OnRequestCredential(kRequestId, false, federations);
+
+  RunAllPendingTasks();

[vabr (Chromium), 2014/09/30 12:16:55]

There are multiple copies of the same sink-checking code across the tests.
Please consider making it a helper method taking the message type ID and
returning IPC::Message.

+
+  const uint32 kMsgID = CredentialManagerMsg_RejectCredentialRequest::ID;
+  const IPC::Message* message =
+      process()->sink().GetFirstMessageMatching(kMsgID);
+  EXPECT_TRUE(message);
+  process()->sink().ClearMessages();
+}
+
+TEST_F(ContentCredentialManagerDispatcherTest,
+       CredentialManagerOnRequestCredentialWithFullPasswordStore) {
+  store_->AddLogin(form_);
+
   std::vector<GURL> federations;
   dispatcher()->OnRequestCredential(kRequestId, false, federations);
 
@@ -132,6 +159,8 @@ TEST_F(ContentCredentialManagerDispatcherTest,
 
 TEST_F(ContentCredentialManagerDispatcherTest,
        CredentialManagerOnRequestCredentialWhileRequestPending) {
+  store_->AddLogin(form_);
+
   std::vector<GURL> federations;
   dispatcher()->OnRequestCredential(kRequestId, false, federations);
   dispatcher()->OnRequestCredential(kRequestId, false, federations);