CREDENTIAL: Filter affiliated credentials.

components/password_manager/content/browser/credential_manager_dispatcher_unittest.cc

Index: components/password_manager/content/browser/credential_manager_dispatcher_unittest.cc
diff --git a/components/password_manager/content/browser/credential_manager_dispatcher_unittest.cc b/components/password_manager/content/browser/credential_manager_dispatcher_unittest.cc
index da2ab7026c2221e64b48aef3ca01c554e1513b3e..fd7aca92178a7d2bd056250fd8b1eecad436c412 100644
--- a/components/password_manager/content/browser/credential_manager_dispatcher_unittest.cc
+++ b/components/password_manager/content/browser/credential_manager_dispatcher_unittest.cc
@@ -674,6 +674,84 @@ TEST_F(CredentialManagerDispatcherTest,
   ExpectZeroClickSignInFailure();
 }
 
+TEST_F(CredentialManagerDispatcherTest,
+       CredentialManagerOnRequestCredentialAffiliatedPasswordMatch) {
+  store_->AddLogin(affiliated_form1_);
+  client_->set_first_run_seen(true);
+  MockAffiliatedMatchHelper* mock_helper = new MockAffiliatedMatchHelper;
+  store_->SetAffiliatedMatchHelper(make_scoped_ptr(mock_helper));

[vabr (Chromium), 2016/02/23 09:24:54]

nit: Here and below, please either inline mock_helper, or make it a scoped_ptr
instead of a raw one and std::move it:

auto mock_helper = make_scoped_ptr(new MockAffiliatedMatchHelper);
store_->SetAffiliatedMatchHelper(std::move(mock_helper));

You can use store_->affiliated_match_helper() to get the weak pointer when
needed.

While it is unlikely that somebody would insert an early exit between lines 681
and 682, it's easier to just always play it safe than to reason about what could
happen or not.

+
+  std::vector<GURL> federations;
+  std::vector<std::string> affiliated_realms;
+  affiliated_realms.push_back(kTestAndroidRealm1);
+  mock_helper->ExpectCallToGetAffiliatedAndroidRealms(
+      dispatcher_->GetSynthesizedFormForOrigin(), affiliated_realms);
+
+  dispatcher()->OnRequestCredential(kRequestId, true, true, federations);
+
+  ExpectZeroClickSignInSuccess(CredentialType::CREDENTIAL_TYPE_PASSWORD);
+}
+
+TEST_F(CredentialManagerDispatcherTest,
+       CredentialManagerOnRequestCredentialAffiliatedPasswordNoMatch) {
+  store_->AddLogin(affiliated_form1_);
+  client_->set_first_run_seen(true);
+  MockAffiliatedMatchHelper* mock_helper = new MockAffiliatedMatchHelper;
+  store_->SetAffiliatedMatchHelper(make_scoped_ptr(mock_helper));
+
+  std::vector<GURL> federations;
+  std::vector<std::string> affiliated_realms;
+  affiliated_realms.push_back(kTestAndroidRealm1);
+  mock_helper->ExpectCallToGetAffiliatedAndroidRealms(
+      dispatcher_->GetSynthesizedFormForOrigin(), affiliated_realms);
+
+  dispatcher()->OnRequestCredential(kRequestId, true, false, federations);

[vabr (Chromium), 2016/02/23 09:24:54]

nit: The "false" here is the only difference to the test above, and it causes
the different test outcome. We should have a comment about what the "false"
means (and the "true" on the same position on line 690).

+
+  ExpectZeroClickSignInFailure();
+}
+
+TEST_F(CredentialManagerDispatcherTest,
+       CredentialManagerOnRequestCredentialAffiliatedFederatedMatch) {
+  affiliated_form1_.federation_url = GURL("https://example.com/");
+  store_->AddLogin(affiliated_form1_);
+  client_->set_first_run_seen(true);
+  MockAffiliatedMatchHelper* mock_helper = new MockAffiliatedMatchHelper;
+  store_->SetAffiliatedMatchHelper(make_scoped_ptr(mock_helper));
+
+  std::vector<GURL> federations;
+  federations.push_back(GURL("https://example.com/"));
+
+  std::vector<std::string> affiliated_realms;
+  affiliated_realms.push_back(kTestAndroidRealm1);
+  mock_helper->ExpectCallToGetAffiliatedAndroidRealms(
+      dispatcher_->GetSynthesizedFormForOrigin(), affiliated_realms);
+
+  dispatcher()->OnRequestCredential(kRequestId, true, true, federations);
+
+  ExpectZeroClickSignInSuccess(CredentialType::CREDENTIAL_TYPE_FEDERATED);
+}
+
+TEST_F(CredentialManagerDispatcherTest,
+       CredentialManagerOnRequestCredentialAffiliatedFederatedNoMatch) {
+  affiliated_form1_.federation_url = GURL("https://example.com/");
+  store_->AddLogin(affiliated_form1_);
+  client_->set_first_run_seen(true);
+  MockAffiliatedMatchHelper* mock_helper = new MockAffiliatedMatchHelper;
+  store_->SetAffiliatedMatchHelper(make_scoped_ptr(mock_helper));
+
+  std::vector<GURL> federations;
+  federations.push_back(GURL("https://not-example.com/"));
+
+  std::vector<std::string> affiliated_realms;
+  affiliated_realms.push_back(kTestAndroidRealm1);
+  mock_helper->ExpectCallToGetAffiliatedAndroidRealms(
+      dispatcher_->GetSynthesizedFormForOrigin(), affiliated_realms);
+
+  dispatcher()->OnRequestCredential(kRequestId, true, true, federations);
+
+  ExpectZeroClickSignInFailure();
+}
+
 TEST_F(CredentialManagerDispatcherTest, RequestCredentialWithoutFirstRun) {
   client_->set_first_run_seen(false);