[PasswordManager clean-up] Merge copies of CreatePasswordFormFromData

chrome/browser/password_manager/password_store_x_unittest.cc

Index: chrome/browser/password_manager/password_store_x_unittest.cc
diff --git a/chrome/browser/password_manager/password_store_x_unittest.cc b/chrome/browser/password_manager/password_store_x_unittest.cc
index 704df06cfca0724c8e7bd85199e4f15671dc3d50..22f43865ba1eb7225030c9347da051ef19fa6fe1 100644
--- a/chrome/browser/password_manager/password_store_x_unittest.cc
+++ b/chrome/browser/password_manager/password_store_x_unittest.cc
@@ -16,7 +16,7 @@
 #include "base/time/time.h"
 #include "chrome/browser/password_manager/password_store_x.h"
 #include "chrome/test/base/testing_browser_process.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/common/password_manager_pref_names.h"
@@ -239,7 +239,7 @@ void InitExpectedForms(bool autofillable,
         autofillable,
         false,
         static_cast<double>(i + 1)};
-    forms->push_back(CreatePasswordFormFromData(data).release());
+    forms->push_back(CreatePasswordFormFromDataForTesting(data).release());
   }
 }
 
@@ -298,7 +298,8 @@ TEST_P(PasswordStoreXTest, Notifications) {
       L"password_element",             L"username_value",
       L"password_value",               true,
       false,                           1};
-  scoped_ptr<PasswordForm> form = CreatePasswordFormFromData(form_data);
+  scoped_ptr<PasswordForm> form =
+      CreatePasswordFormFromDataForTesting(form_data);
 
   MockPasswordStoreObserver observer;
   store->AddObserver(&observer);