Mocker for OSCrypt

components/autofill/core/browser/autofill_merge_unittest.cc

Index: components/autofill/core/browser/autofill_merge_unittest.cc
diff --git a/components/autofill/core/browser/autofill_merge_unittest.cc b/components/autofill/core/browser/autofill_merge_unittest.cc
index 8eb2e2ad175b4af91972efc50dc8f73cae804b0e..64a55198252555189fb508515ed23552ac39ddd5 100644
--- a/components/autofill/core/browser/autofill_merge_unittest.cc
+++ b/components/autofill/core/browser/autofill_merge_unittest.cc
@@ -164,6 +164,8 @@ class AutofillMergeTest : public DataDrivenTest,
   // testing::Test:
   void SetUp() override;
 
+  void TearDown() override;
+
   // DataDrivenTest:
   void GenerateResults(const std::string& input, std::string* output) override;
 
@@ -194,7 +196,11 @@ AutofillMergeTest::~AutofillMergeTest() {
 }
 
 void AutofillMergeTest::SetUp() {
-  test::DisableSystemServices(NULL);
+  test::DisableSystemServices(nullptr);
+}
+
+void AutofillMergeTest::TearDown() {
+  test::ReenableSystemServices();
 }
 
 void AutofillMergeTest::GenerateResults(const std::string& input,