[PasswordManager clean-up] Merge copies of CreatePasswordFormFromData

The Mac unit-test had a separate copy of CreatePasswordFormFromData, which did almost the same as the platform-independent version. This CL merges them by replacing the platform-independent instance with the more recently updated Mac copy. It also renames the methods to make clear they are for testing only.

BUG=451018

Review URL: https://codereview.chromium.org/896903003

Cr-Commit-Position: refs/heads/master@{#315529}

6 files changed, 38 insertions, 17 deletions

diff --git a/components/password_manager.gypi b/components/password_manager.gypi
index af53573..90d7f3b 100644
--- a/components/password_manager.gypi
+++ b/components/password_manager.gypi
@@ -167,8 +167,8 @@
         'password_manager/core/browser/mock_affiliation_consumer.h',
         'password_manager/core/browser/mock_password_store.cc',
         'password_manager/core/browser/mock_password_store.h',
-        'password_manager/core/browser/password_form_data.cc',
-        'password_manager/core/browser/password_form_data.h',
+        'password_manager/core/browser/password_manager_test_utils.cc',
+        'password_manager/core/browser/password_manager_test_utils.h',
         'password_manager/core/browser/stub_password_manager_client.cc',
         'password_manager/core/browser/stub_password_manager_client.h',
         'password_manager/core/browser/stub_password_manager_driver.cc',
diff --git a/components/password_manager/core/browser/BUILD.gn b/components/password_manager/core/browser/BUILD.gn
index d836297..54195e3 100644
--- a/components/password_manager/core/browser/BUILD.gn
+++ b/components/password_manager/core/browser/BUILD.gn
@@ -130,8 +130,8 @@ source_set("test_support") {
     "mock_affiliation_consumer.h",
     "mock_password_store.cc",
     "mock_password_store.h",
-    "password_form_data.cc",
-    "password_form_data.h",
+    "password_manager_test_utils.cc",
+    "password_manager_test_utils.h",
     "stub_password_manager_client.cc",
     "stub_password_manager_client.h",
     "stub_password_manager_driver.cc",
diff --git a/components/password_manager/core/browser/password_form_data.cc b/components/password_manager/core/browser/password_manager_test_utils.cc
index a53328e..42634fd 100644
--- a/components/password_manager/core/browser/password_form_data.cc
+++ b/components/password_manager/core/browser/password_manager_test_utils.cc
@@ -2,21 +2,31 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "components/password_manager/core/browser/password_manager_test_utils.h"
+
+#include <set>
+
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/password_manager/core/browser/password_form_data.h"
 
 using autofill::PasswordForm;
 
 namespace password_manager {
 
-scoped_ptr<PasswordForm> CreatePasswordFormFromData(
+const char kTestingAvatarUrlSpec[] = "https://accounts.google.com/Avatar";
+const char kTestingFederationUrlSpec[] = "https://accounts.google.com/login";
+const int kTestingDaysAfterPasswordsAreSynced = 1;
+
+scoped_ptr<PasswordForm> CreatePasswordFormFromDataForTesting(
     const PasswordFormData& form_data) {
   scoped_ptr<PasswordForm> form(new PasswordForm());
   form->scheme = form_data.scheme;
   form->preferred = form_data.preferred;
   form->ssl_valid = form_data.ssl_valid;
   form->date_created = base::Time::FromDoubleT(form_data.creation_time);
+  form->date_synced =
+      form->date_created +
+      base::TimeDelta::FromDays(kTestingDaysAfterPasswordsAreSynced);
   if (form_data.signon_realm)
     form->signon_realm = std::string(form_data.signon_realm);
   if (form_data.origin)
@@ -31,11 +41,15 @@ scoped_ptr<PasswordForm> CreatePasswordFormFromData(
     form->password_element = base::WideToUTF16(form_data.password_element);
   if (form_data.username_value) {
     form->username_value = base::WideToUTF16(form_data.username_value);
+    form->display_name = form->username_value;
+    form->skip_zero_click = true;
     if (form_data.password_value)
       form->password_value = base::WideToUTF16(form_data.password_value);
   } else {
     form->blacklisted_by_user = true;
   }
+  form->avatar_url = GURL(kTestingAvatarUrlSpec);
+  form->federation_url = GURL(kTestingFederationUrlSpec);
   return form.Pass();
 }
 
diff --git a/components/password_manager/core/browser/password_form_data.h b/components/password_manager/core/browser/password_manager_test_utils.h
index 33ea01c..71599a4 100644
--- a/components/password_manager/core/browser/password_form_data.h
+++ b/components/password_manager/core/browser/password_manager_test_utils.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_FORM_DATA_H_
-#define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_FORM_DATA_H_
+#ifndef COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_MANAGER_TEST_UTILS_H_
+#define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_MANAGER_TEST_UTILS_H_
 
-#include <ostream>
+#include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "components/autofill/core/common/password_form.h"
@@ -15,6 +15,12 @@
 
 namespace password_manager {
 
+// These constants are used by CreatePasswordFormFromDataForTesting to supply
+// values not covered by PasswordFormData.
+extern const char kTestingAvatarUrlSpec[];
+extern const char kTestingFederationUrlSpec[];
+extern const int kTestingDaysAfterPasswordsAreSynced;
+
 // Struct used for creation of PasswordForms from static arrays of data.
 // Note: This is only meant to be used in unit test.
 struct PasswordFormData {
@@ -33,7 +39,7 @@ struct PasswordFormData {
 };
 
 // Creates and returns a new PasswordForm built from form_data.
-scoped_ptr<autofill::PasswordForm> CreatePasswordFormFromData(
+scoped_ptr<autofill::PasswordForm> CreatePasswordFormFromDataForTesting(
     const PasswordFormData& form_data);
 
 // Checks whether two vectors of PasswordForms contain equivalent elements,
@@ -51,4 +57,4 @@ MATCHER_P(ContainsSamePasswordForms, forms, "") {
 
 }  // namespace password_manager
 
-#endif  // COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_FORM_DATA_H_
+#endif  // COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_MANAGER_TEST_UTILS_H_
diff --git a/components/password_manager/core/browser/password_store_default_unittest.cc b/components/password_manager/core/browser/password_store_default_unittest.cc
index fe9a6fb..73ff7e7 100644
--- a/components/password_manager/core/browser/password_store_default_unittest.cc
+++ b/components/password_manager/core/browser/password_store_default_unittest.cc
@@ -13,7 +13,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "components/password_manager/core/browser/login_database.h"
-#include "components/password_manager/core/browser/password_form_data.h"
+#include "components/password_manager/core/browser/password_manager_test_utils.h"
 #include "components/password_manager/core/browser/password_store_change.h"
 #include "components/password_manager/core/browser/password_store_consumer.h"
 #include "components/password_manager/core/browser/password_store_default.h"
@@ -121,7 +121,7 @@ TEST_F(PasswordStoreDefaultTest, NonASCIIData) {
   ScopedVector<PasswordForm> expected_forms;
   for (unsigned int i = 0; i < arraysize(form_data); ++i) {
     expected_forms.push_back(
-        CreatePasswordFormFromData(form_data[i]).release());
+        CreatePasswordFormFromDataForTesting(form_data[i]).release());
     store->AddLogin(*expected_forms.back());
   }
 
@@ -147,7 +147,7 @@ TEST_F(PasswordStoreDefaultTest, Notifications) {
   store->Init(syncer::SyncableService::StartSyncFlare());
 
   scoped_ptr<PasswordForm> form =
-      CreatePasswordFormFromData(CreateTestPasswordFormData());
+      CreatePasswordFormFromDataForTesting(CreateTestPasswordFormData());
 
   MockPasswordStoreObserver observer;
   store->AddObserver(&observer);
@@ -210,7 +210,7 @@ TEST_F(PasswordStoreDefaultTest, OperationsOnABadDatabaseSilentlyFail) {
 
   // Add a new autofillable login + a blacklisted login.
   scoped_ptr<PasswordForm> form =
-      CreatePasswordFormFromData(CreateTestPasswordFormData());
+      CreatePasswordFormFromDataForTesting(CreateTestPasswordFormData());
   scoped_ptr<PasswordForm> blacklisted_form(new PasswordForm(*form));
   blacklisted_form->signon_realm = "http://foo.example.com";
   blacklisted_form->origin = GURL("http://foo.example.com/origin");
diff --git a/components/password_manager/core/browser/password_store_unittest.cc b/components/password_manager/core/browser/password_store_unittest.cc
index 057fbfd..3b06f4a 100644
--- a/components/password_manager/core/browser/password_store_unittest.cc
+++ b/components/password_manager/core/browser/password_store_unittest.cc
@@ -9,7 +9,7 @@
 #include "base/strings/string_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/time/time.h"
-#include "components/password_manager/core/browser/password_form_data.h"
+#include "components/password_manager/core/browser/password_manager_test_utils.h"
 #include "components/password_manager/core/browser/password_store_consumer.h"
 #include "components/password_manager/core/browser/password_store_default.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -137,7 +137,8 @@ TEST_F(PasswordStoreTest, IgnoreOldWwwGoogleLogins) {
   // Build the forms vector and add the forms to the store.
   ScopedVector<PasswordForm> all_forms;
   for (size_t i = 0; i < arraysize(form_data); ++i) {
-    all_forms.push_back(CreatePasswordFormFromData(form_data[i]).release());
+    all_forms.push_back(
+        CreatePasswordFormFromDataForTesting(form_data[i]).release());
     store->AddLogin(*all_forms.back());
   }
   base::MessageLoop::current()->RunUntilIdle();