Credential Manager: Respect the 'skip_zero_click' flag for 'request()'.

components/password_manager/content/browser/credential_manager_dispatcher_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/password_manager/content/browser/credential_manager_dispatcher.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/testing_pref_service.h"
@@ skipping 149 matching lines @@
         web_contents(), client_.get(), &stub_driver_));
 
     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;
+    form_.skip_zero_click = false;
 
     form2_.username_value = base::ASCIIToUTF16("Username 2");
     form2_.display_name = base::ASCIIToUTF16("Display Name 2");
     form2_.password_value = base::ASCIIToUTF16("Password 2");
     form2_.origin = web_contents()->GetLastCommittedURL().GetOrigin();
-    form2_.signon_realm = form_.origin.spec();
+    form2_.signon_realm = form2_.origin.spec();
     form2_.scheme = autofill::PasswordForm::SCHEME_HTML;
+    form2_.skip_zero_click = false;
 
     cross_origin_form_.username_value = base::ASCIIToUTF16("Username");
     cross_origin_form_.display_name = base::ASCIIToUTF16("Display Name");
     cross_origin_form_.password_value = base::ASCIIToUTF16("Password");
     cross_origin_form_.origin = GURL("https://example.net/");
     cross_origin_form_.signon_realm = cross_origin_form_.origin.spec();
     cross_origin_form_.scheme = autofill::PasswordForm::SCHEME_HTML;
+    cross_origin_form_.skip_zero_click = false;
 
     store_->Clear();
     EXPECT_TRUE(store_->IsEmpty());
   }
 
   void TearDown() override {
     store_->Shutdown();
     content::RenderViewHostTestHarness::TearDown();
   }
 
@@ skipping 203 matching lines @@
   EXPECT_TRUE(message);
   EXPECT_FALSE(client_->did_prompt_user_to_choose());
   CredentialManagerMsg_SendCredential::Param send_param;
   CredentialManagerMsg_SendCredential::Read(message, &send_param);
 
   // With two items in the password store, we shouldn't get credentials back.
   EXPECT_EQ(CredentialType::CREDENTIAL_TYPE_EMPTY, get<1>(send_param).type);
 }
 
 TEST_F(CredentialManagerDispatcherTest,
+       OnRequestCredentialWithZeroClickOnlyOnePasswordStore) {
+  form_.skip_zero_click = true;
+  store_->AddLogin(form_);
+  store_->AddLogin(form2_);
+
+  std::vector<GURL> federations;
+  dispatcher()->OnRequestCredential(kRequestId, true, federations);
+
+  RunAllPendingTasks();
+
+  const uint32 kMsgID = CredentialManagerMsg_SendCredential::ID;
+  const IPC::Message* message =
+      process()->sink().GetFirstMessageMatching(kMsgID);
+  EXPECT_TRUE(message);
+  EXPECT_FALSE(client_->did_prompt_user_to_choose());
+  CredentialManagerMsg_SendCredential::Param send_param;
+  CredentialManagerMsg_SendCredential::Read(message, &send_param);
+
+  // We should get |form_| back, as |form2_| is marked as skipping zero-click.

[vasilii, 2015/02/09 10:44:07]

Actually |form_| is marked as skipping zero-click.

[Mike West, 2015/02/09 10:51:49]

Good eye, thanks!

+  EXPECT_EQ(CredentialType::CREDENTIAL_TYPE_LOCAL, get<1>(send_param).type);

[vabr (Chromium), 2015/02/09 10:31:13]

Should you also check, e.g., the .name field to verify that this is indeed form_
being sent back?

[vasilii, 2015/02/09 10:44:07]

Acknowledged.

[Mike West, 2015/02/09 10:51:49]

Done.

+}
+
+TEST_F(CredentialManagerDispatcherTest,
+       OnRequestCredentialWithZeroClickOnlyCrossOriginPasswordStore) {
+  store_->AddLogin(cross_origin_form_);
+
+  form_.skip_zero_click = true;
+  store_->AddLogin(form_);
+
+  std::vector<GURL> federations;
+  dispatcher()->OnRequestCredential(kRequestId, true, federations);
+
+  RunAllPendingTasks();
+
+  const uint32 kMsgID = CredentialManagerMsg_SendCredential::ID;
+  const IPC::Message* message =
+      process()->sink().GetFirstMessageMatching(kMsgID);
+  EXPECT_TRUE(message);
+  EXPECT_FALSE(client_->did_prompt_user_to_choose());
+  CredentialManagerMsg_SendCredential::Param send_param;
+  CredentialManagerMsg_SendCredential::Read(message, &send_param);
+
+  // We only have cross-origin zero-click credentials; they should not be
+  // returned.
+  EXPECT_EQ(CredentialType::CREDENTIAL_TYPE_EMPTY, get<1>(send_param).type);
+}
+
+TEST_F(CredentialManagerDispatcherTest,
        CredentialManagerOnRequestCredentialWhileRequestPending) {
   client_->set_zero_click_enabled(false);
   store_->AddLogin(form_);
 
   std::vector<GURL> federations;
   dispatcher()->OnRequestCredential(kRequestId, false, federations);
   dispatcher()->OnRequestCredential(kRequestId, false, federations);
 
   // Check that the second request triggered a rejection.
   uint32 kMsgID = CredentialManagerMsg_RejectCredentialRequest::ID;
@@ skipping 35 matching lines @@
   const IPC::Message* message =
       process()->sink().GetFirstMessageMatching(kMsgID);
   ASSERT_TRUE(message);
   CredentialManagerMsg_SendCredential::Param param;
   CredentialManagerMsg_SendCredential::Read(message, &param);
   EXPECT_EQ(CredentialType::CREDENTIAL_TYPE_EMPTY, get<1>(param).type);
   EXPECT_FALSE(client_->did_prompt_user_to_choose());
 }
 
 }  // namespace password_manager