Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(863)

Unified Diff: chrome/browser/password_manager/password_store_factory.cc

Issue 176583002: [OS X] Wire up --use-mock-keychain command line flag to encryptor module (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix license header Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/password_manager/password_store_factory.cc
diff --git a/chrome/browser/password_manager/password_store_factory.cc b/chrome/browser/password_manager/password_store_factory.cc
index 2ad9819032f8143aa94e16c5e3222698d6d65a2f..e424e4a3f0ae360fd54ecc95c2284ef897f0050d 100644
--- a/chrome/browser/password_manager/password_store_factory.cc
+++ b/chrome/browser/password_manager/password_store_factory.cc
@@ -14,6 +14,7 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
+#include "components/encryptor/encryptor_switches.h"
#include "components/password_manager/core/browser/login_database.h"
#include "components/password_manager/core/browser/password_store.h"
#include "components/password_manager/core/browser/password_store_default.h"
@@ -145,7 +146,8 @@ BrowserContextKeyedService* PasswordStoreFactory::BuildServiceInstanceFor(
WebDataService::FromBrowserContext(profile));
#elif defined(OS_MACOSX)
crypto::AppleKeychain* keychain =
- CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseMockKeychain) ?
+ CommandLine::ForCurrentProcess()->HasSwitch(
+ encryptor::switches::kUseMockKeychain) ?
new crypto::MockAppleKeychain() : new crypto::AppleKeychain();
ps = new PasswordStoreMac(
main_thread_runner, db_thread_runner, keychain, login_db.release());
« no previous file with comments | « no previous file | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698