chrome/browser/password_manager/password_store_mac.cc - Issue 1226303003: Start the migration of passwords from the Keychain.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1226303003: Start the migration of passwords from the Keychain. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix the test Created 5 years, 5 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 | « chrome/browser/password_manager/password_store_factory.cc ('k') | chrome/browser/password_manager/password_store_mac_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/password_manager/password_store_mac.cc

diff --git a/chrome/browser/password_manager/password_store_mac.cc b/chrome/browser/password_manager/password_store_mac.cc

index 32473611770d5742e22bf3fb0b0ef05659d7788a..17d02eb1e4a7d8856ebd0bbd3c936cb74a2450ff 100644

--- a/chrome/browser/password_manager/password_store_mac.cc

+++ b/chrome/browser/password_manager/password_store_mac.cc

@@ -960,8 +960,8 @@ PasswordStoreMac::~PasswordStoreMac() {}

void PasswordStoreMac::InitWithTaskRunner(

scoped_refptr<base::SingleThreadTaskRunner> background_task_runner) {

- DCHECK_CURRENTLY_ON(content::BrowserThread::UI);

db_thread_runner_ = background_task_runner;

+ DCHECK(GetBackgroundTaskRunner()->BelongsToCurrentThread());

}

PasswordStoreMac::MigrationResult PasswordStoreMac::ImportFromKeychain() {

@@ -1050,7 +1050,8 @@ PasswordStoreMac::MigrationResult PasswordStoreMac::ImportFromKeychain() {

void PasswordStoreMac::set_login_metadata_db(

password_manager::LoginDatabase* login_db) {

login_metadata_db_ = login_db;

- login_metadata_db_->set_clear_password_values(true);

+ if (login_metadata_db_)

+ login_metadata_db_->set_clear_password_values(true);

}

bool PasswordStoreMac::Init(