[PasswordManager clean-up] Merge copies of CreatePasswordFormFromData

chrome/browser/password_manager/password_store_win_unittest.cc

 // Copyright (c) 2012 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 <windows.h>
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/time/time.h"
 #include "chrome/browser/password_manager/password_store_win.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/os_crypt/ie7_password_win.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/webdata/logins_table.h"
 #include "components/password_manager/core/browser/webdata/password_web_data_service_win.h"
 #include "components/password_manager/core/common/password_manager_pref_names.h"
 #include "components/webdata/common/web_database_service.h"
 #include "content/public/test/test_browser_thread.h"
 #include "crypto/wincrypt_shim.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 190 matching lines @@
     "http://example.com/",
     "http://example.com/origin",
     "http://example.com/action",
     L"submit_element",
     L"username_element",
     L"password_element",
     L"",
     L"",
     true, false, 1,
   };
-  scoped_ptr<PasswordForm> form = CreatePasswordFormFromData(form_data);
+  scoped_ptr<PasswordForm> form =
+      CreatePasswordFormFromDataForTesting(form_data);
 
   // The returned form will not have 'action' or '*_element' fields set. This
   // is because credentials imported from IE don't have this information.
   PasswordFormData expected_form_data = {
     PasswordForm::SCHEME_HTML,
     "http://example.com/",
     "http://example.com/origin",
     "",
     L"",
     L"",
     L"",
     L"abcdefgh",
     L"abcdefghijkl",
     true, false, 1,
   };
   ScopedVector<autofill::PasswordForm> expected_forms;
-  expected_forms.push_back(CreatePasswordFormFromData(expected_form_data));
+  expected_forms.push_back(
+      CreatePasswordFormFromDataForTesting(expected_form_data));
 
   // The IE7 password should be returned.
   EXPECT_CALL(consumer, OnGetPasswordStoreResultsConstRef(
                             ContainsSamePasswordForms(expected_forms.get())))
       .WillOnce(QuitUIMessageLoop());
 
   store_->GetLogins(*form, PasswordStore::DISALLOW_PROMPT, &consumer);
   base::MessageLoop::current()->Run();
 }
 
 // Crashy.  http://crbug.com/86558
 TEST_F(PasswordStoreWinTest, DISABLED_OutstandingWDSQueries) {
   store_ = CreatePasswordStore();
   EXPECT_TRUE(store_->Init(syncer::SyncableService::StartSyncFlare()));
 
   PasswordFormData form_data = {
     PasswordForm::SCHEME_HTML,
     "http://example.com/",
     "http://example.com/origin",
     "http://example.com/action",
     L"submit_element",
     L"username_element",
     L"password_element",
     L"",
     L"",
     true, false, 1,
   };
-  scoped_ptr<PasswordForm> form = CreatePasswordFormFromData(form_data);
+  scoped_ptr<PasswordForm> form =
+      CreatePasswordFormFromDataForTesting(form_data);
 
   MockPasswordStoreConsumer consumer;
   store_->GetLogins(*form, PasswordStore::DISALLOW_PROMPT, &consumer);
 
   // Release the PSW and the WDS before the query can return.
   store_->Shutdown();
   store_ = NULL;
   wds_ = NULL;
 
   base::MessageLoop::current()->RunUntilIdle();
@@ skipping 27 matching lines @@
     "http://example.com/",
     "http://example.com/origin",
     "http://example.com/action",
     L"submit_element",
     L"username_element",
     L"password_element",
     L"",
     L"",
     true, false, 1,
   };
-  scoped_ptr<PasswordForm> form = CreatePasswordFormFromData(form_data);
+  scoped_ptr<PasswordForm> form =
+      CreatePasswordFormFromDataForTesting(form_data);
 
   PasswordFormData expected_form_data = {
     PasswordForm::SCHEME_HTML,
     "http://example.com/",
     "http://example.com/origin",
     "http://example.com/action",
     L"submit_element",
     L"username_element",
     L"password_element",
     L"abcdefgh",
     L"abcdefghijkl",
     true, false, 1,
   };
   ScopedVector<autofill::PasswordForm> expected_forms;
-  expected_forms.push_back(CreatePasswordFormFromData(expected_form_data));
+  expected_forms.push_back(
+      CreatePasswordFormFromDataForTesting(expected_form_data));
 
   // The IE7 password should be returned.
   EXPECT_CALL(password_consumer,
               OnGetPasswordStoreResultsConstRef(ContainsSamePasswordForms(
                   expected_forms.get()))).WillOnce(QuitUIMessageLoop());
 
   store_->GetLogins(*form, PasswordStore::DISALLOW_PROMPT, &password_consumer);
 
   MockWebDataServiceConsumer wds_consumer;
 
@@ skipping 19 matching lines @@
     "http://example.com/",
     "http://example.com/origin",
     "http://example.com/action",
     L"submit_element",
     L"username_element",
     L"password_element",
     L"",
     L"",
     true, false, 1,
   };
-  scoped_ptr<PasswordForm> form = CreatePasswordFormFromData(form_data);
+  scoped_ptr<PasswordForm> form =
+      CreatePasswordFormFromDataForTesting(form_data);
 
   MockPasswordStoreConsumer consumer;
 
   // Make sure we quit the MessageLoop even if the test fails.
   ON_CALL(consumer, OnGetPasswordStoreResultsConstRef(_))
       .WillByDefault(QuitUIMessageLoop());
 
   EXPECT_CALL(consumer, OnGetPasswordStoreResultsConstRef(ElementsAre()))
       .WillOnce(QuitUIMessageLoop());
 
@@ skipping 27 matching lines @@
   // Make sure we quit the MessageLoop even if the test fails.
   ON_CALL(consumer, OnGetPasswordStoreResultsConstRef(_))
       .WillByDefault(QuitUIMessageLoop());
 
   EXPECT_CALL(consumer, OnGetPasswordStoreResultsConstRef(ElementsAre()))
       .WillOnce(QuitUIMessageLoop());
 
   store_->GetAutofillableLogins(&consumer);
   base::MessageLoop::current()->Run();
 }