Mocker for OSCrypt

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 <string>
 
 #include "base/guid.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.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/browser/webdata/autofill_table.h"
 #include "components/autofill/core/common/autofill_constants.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/os_crypt/os_crypt.h"
+#include "components/os_crypt/os_crypt_mocker.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/pref_service_factory.h"
 #include "components/prefs/testing_pref_store.h"
 #include "components/signin/core/browser/account_fetcher_service.h"
 #include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/common/signin_pref_names.h"
 
 using base::ASCIIToUTF16;
 
@@ skipping 271 matching lines @@
     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_FULL, 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(PrefService* prefs) {
   // Use a mock Keychain rather than the OS one to store credit card data.
-#if defined(OS_MACOSX)
-  OSCrypt::UseMockKeychain(true);
-#endif  // defined(OS_MACOSX)
+  OSCryptMocker::SetUpWithSingleton();

[vabr (Chromium), 2016/05/24 13:33:44]

Missing OSCryptMocker::TearDown?

[cfroussios, 2016/05/25 13:13:09]

Done.

 }
 
 void SetServerCreditCards(AutofillTable* table,
                           const std::vector<CreditCard>& cards) {
   std::vector<CreditCard> as_masked_cards = cards;
   for (CreditCard& card : as_masked_cards) {
     card.set_record_type(CreditCard::MASKED_SERVER_CARD);
     std::string type = card.type();
     card.SetNumber(card.LastFourDigits());
     card.SetTypeForMaskedCard(type.c_str());
@@ skipping 36 matching lines @@
   if (name)
     field->set_name(name);
   if (control_type)
     field->set_type(control_type);
   if (label)
     field->set_label(label);
 }
 
 }  // namespace test
 }  // namespace autofill