Mocker for OSCrypt

chrome/browser/signin/local_auth_unittest.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 "chrome/browser/signin/local_auth.h"
 
 #include <stddef.h>
 
 #include "base/base64.h"
 #include "build/build_config.h"
 #include "chrome/browser/profiles/profile_attributes_entry.h"
 #include "chrome/browser/profiles/profile_attributes_storage.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
-#include "components/os_crypt/os_crypt.h"
+#include "components/os_crypt/os_crypt_mocker.h"
 #include "components/prefs/pref_service.h"
 #include "components/syncable_prefs/testing_pref_service_syncable.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 class LocalAuthTest : public testing::Test {
   content::TestBrowserThreadBundle thread_bundle_;
+
+  void SetUp() override { OSCryptMocker::SetUpWithSingleton(); }

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

Could you do this in the constructor and destructor of LocalAuthTest instead of
the SetUp and TearDown? The former is preferred, see:
 *
https://github.com/google/googletest/blob/master/googletest/docs/V1_7_FAQ.md#...,
and
 *
https://groups.google.com/a/chromium.org/forum/#!msg/chromium-dev/J2K-2Dmupb8...

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

Done.

+
+  void TearDown() override { OSCryptMocker::TearDown(); }
 };
 
 TEST_F(LocalAuthTest, SetAndCheckCredentials) {
   TestingProfileManager testing_profile_manager(
       TestingBrowserProcess::GetGlobal());
   ASSERT_TRUE(testing_profile_manager.SetUp());
   Profile* prof = testing_profile_manager.CreateTestingProfile("p1");
   ProfileAttributesEntry* entry;
   ASSERT_TRUE(testing_profile_manager.profile_attributes_storage()->
       GetProfileAttributesWithPath(prof->GetPath(), &entry));
   EXPECT_EQ("", entry->GetLocalAuthCredentials());
 
-#if defined(OS_MACOSX)
-  OSCrypt::UseMockKeychain(true);
-#endif
-
   std::string password("Some Password");
   EXPECT_FALSE(LocalAuth::ValidateLocalAuthCredentials(prof, password));
 
   LocalAuth::SetLocalAuthCredentials(prof, password);
   std::string passhash = entry->GetLocalAuthCredentials();
 
   // We perform basic validation on the written record to ensure bugs don't slip
   // in that cannot be seen from the API:
   //  - The encoding exists (we can guarantee future backward compatibility).
   //  - The plaintext version of the password is not mistakenly stored anywhere.
@@ skipping 12 matching lines @@
   LocalAuth::SetLocalAuthCredentials(prof, password);  // makes different salt
   EXPECT_NE(passhash, entry->GetLocalAuthCredentials());
 }
 
 TEST_F(LocalAuthTest, SetUpgradeAndCheckCredentials) {
   TestingProfileManager testing_profile_manager(
       TestingBrowserProcess::GetGlobal());
   ASSERT_TRUE(testing_profile_manager.SetUp());
   Profile* prof = testing_profile_manager.CreateTestingProfile("p1");
 
-#if defined(OS_MACOSX)
-  OSCrypt::UseMockKeychain(true);
-#endif
-
   std::string password("Some Password");
   ProfileAttributesEntry* entry;
   ASSERT_TRUE(testing_profile_manager.profile_attributes_storage()->
       GetProfileAttributesWithPath(prof->GetPath(), &entry));
   LocalAuth::SetLocalAuthCredentialsWithEncoding(entry, password, '1');
 
   // Ensure we indeed persisted the correct encoding.
   std::string oldpasshash = entry->GetLocalAuthCredentials();
   EXPECT_EQ('1', oldpasshash[0]);
 
@@ skipping 25 matching lines @@
 TEST_F(LocalAuthTest, TruncateStringUnevenly) {
   std::string two_chars = "Az";
   std::string three_chars = "AzC";
   // 'z' = 0x7A, ':' = 0x3A.
   std::string two_chars_truncated = "A:";
   EXPECT_EQ(two_chars_truncated,
       LocalAuth::TruncateStringByBits(two_chars, 14));
   EXPECT_EQ(two_chars_truncated,
       LocalAuth::TruncateStringByBits(three_chars, 14));
 }