Mocker for OSCrypt

chrome/browser/browsing_data/browsing_data_remover_unittest.cc

Index: chrome/browser/browsing_data/browsing_data_remover_unittest.cc
diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
index 36cbfe205e3ac884b602e2241551da2824b7d6fe..8db6b6cd31b221e64b037763c5745c9599f9e872 100644
--- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
@@ -58,6 +58,7 @@
 #include "components/favicon/core/favicon_service.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/omnibox/browser/omnibox_pref_names.h"
+#include "components/os_crypt/os_crypt_mocker.h"
 #include "components/password_manager/core/browser/mock_password_store.h"
 #include "components/password_manager/core/browser/password_manager_test_utils.h"
 #include "components/password_manager/core/browser/password_store_consumer.h"
@@ -1010,11 +1011,15 @@ class BrowsingDataRemoverTest : public testing::Test {
 
   ~BrowsingDataRemoverTest() override {}
 
+  void SetUp() override { OSCryptMocker::SetUpWithSingleton(); }

[msramek, 2016/05/24 13:40:57]

Drive by! Wouldn't it suffice to call this in RemovePasswordsTester below? If
this is only needed for one or two tests, I would prefer not adding it to the
BrowsingDataRemoverTest class.

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

Done (assuming below meant above)

+
   void TearDown() override {
 #if defined(ENABLE_EXTENSIONS)
     mock_policy_ = nullptr;
 #endif
 
+    OSCryptMocker::TearDown();
+
     // TestingProfile contains a DOMStorageContext.  BrowserContext's destructor
     // posts a message to the WEBKIT thread to delete some of its member
     // variables. We need to ensure that the profile is destroyed, and that