chrome/browser/content_settings/content_settings_pref_provider_unittest.cc - Issue 1005303003: Split the aggregate dictionary of content settings exceptions into per-type dictionaries

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/content_settings/content_settings_pref_provider_unittest.cc

Issue 1005303003: Split the aggregate dictionary of content settings exceptions into per-type dictionaries (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase, various small changes. Created 5 years, 9 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 | components/content_settings/core/browser/content_settings_pref.h » ('j') | components/content_settings/core/browser/content_settings_pref_provider.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

diff --git a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

index f3811d71f772b9ba6e4955e0be877cac74e99184..6617588f0ca16246805610b3f7a1135b2587526f 100644

--- a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

+++ b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

@@ -43,10 +43,7 @@ class DeadlockCheckerThread : public base::PlatformThread::Delegate {

: provider_(provider) {}

void ThreadMain() override {

- bool got_lock = provider_->content_settings_pref()->lock_.Try();

- EXPECT_TRUE(got_lock);

- if (got_lock)

- provider_->content_settings_pref()->lock_.Release();

+ EXPECT_TRUE(provider_->TestAllLocks());

}

private:

PrefProvider* provider_;