Mocker for OSCrypt

chrome/browser/password_manager/simple_password_store_mac_unittest.cc

 // Copyright 2015 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/password_manager/simple_password_store_mac.h"
 
 #include "base/callback.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/os_crypt/os_crypt.h"
+#include "components/os_crypt/os_crypt_mocker.h"
 #include "components/password_manager/core/browser/login_database.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 using password_manager::PasswordStoreChange;
 using testing::ElementsAreArray;
@@ skipping 10 matching lines @@
 class SimplePasswordStoreMacTest : public testing::Test {
  public:
   SimplePasswordStoreMacTest()
       : thread_bundle_(content::TestBrowserThreadBundle::REAL_FILE_THREAD) {}
 
   void SetUp() override {
     ASSERT_TRUE(db_dir_.CreateUniqueTempDir());
 
     // Ensure that LoginDatabase will use the mock keychain if it needs to
     // encrypt/decrypt a password.
-    OSCrypt::UseMockKeychain(true);
+    OSCryptMocker::SetUpWithSingleton();

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

Should there also be the matching OSCryptMocker::TearDown() call?

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

Done.

 
     // Setup LoginDatabase.
     std::unique_ptr<password_manager::LoginDatabase> login_db(
         new password_manager::LoginDatabase(test_login_db_file_path()));
     scoped_refptr<base::SingleThreadTaskRunner> file_task_runner =
         BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE);
     ASSERT_TRUE(file_task_runner);
     file_task_runner->PostTask(
         FROM_HERE,
         base::Bind(&InitOnBackgroundThread, base::Unretained(login_db.get())));
@@ skipping 55 matching lines @@
       PasswordStoreChange(PasswordStoreChange::ADD, form),
   };
   EXPECT_CALL(observer,
               OnLoginsChanged(ElementsAreArray(expected_add_changes)));
   // Adding a login should trigger a notification.
   store()->AddLogin(form);
   FinishAsyncProcessing();
 }
 
 }  // namespace