Componentize several Autofill unit tests.

components/autofill/core/browser/autofill_test_utils.cc

 // Copyright 2013 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/autofill/core/browser/autofill_test_utils.h"
 
 #include "base/guid.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/pref_service_factory.h"
 #include "base/prefs/testing_pref_store.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "components/encryptor/os_crypt.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "components/user_prefs/user_prefs.h"
-#include "content/public/browser/browser_context.h"
 
 using base::ASCIIToUTF16;
 
 namespace autofill {
 namespace test {
 
 namespace {
 
 const char kSettingsOrigin[] = "Chrome settings";
 
@@ skipping 164 matching lines @@
 
 void SetCreditCardInfo(CreditCard* credit_card,
     const char* name_on_card, const char* card_number,
     const char* expiration_month, const char* expiration_year) {
   check_and_set(credit_card, CREDIT_CARD_NAME, name_on_card);
   check_and_set(credit_card, CREDIT_CARD_NUMBER, card_number);
   check_and_set(credit_card, CREDIT_CARD_EXP_MONTH, expiration_month);
   check_and_set(credit_card, CREDIT_CARD_EXP_4_DIGIT_YEAR, expiration_year);
 }
 
-void DisableSystemServices(content::BrowserContext* browser_context) {
+void DisableSystemServices(PrefService* prefs) {
   // Use a mock Keychain rather than the OS one to store credit card data.
 #if defined(OS_MACOSX)
   OSCrypt::UseMockKeychain(true);
 #endif
 
   // Disable auxiliary profiles for unit testing.  These reach out to system
   // services on the Mac.
-  if (browser_context) {
-    user_prefs::UserPrefs::Get(browser_context)->SetBoolean(
-        prefs::kAutofillAuxiliaryProfilesEnabled, false);
+  if (prefs) {
+    prefs->SetBoolean(prefs::kAutofillAuxiliaryProfilesEnabled, false);
   }

[Ilya Sherman, 2014/03/07 01:52:16]

nit: No need for curlies anymore.

[blundell, 2014/03/07 06:24:19]

Done.

 }
 
 }  // namespace test
 }  // namespace autofill