chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc - Issue 61323002: Fix broken threading model in CheckDesktopNotificationPermission

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/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc

Issue 61323002: Fix broken threading model in CheckDesktopNotificationPermission (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Even more merge conflicts.. Created 7 years, 1 month 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/extensions/api/declarative_webrequest/webrequest_action_unittest.cc ('k') | chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc

diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc

index 31f5b1fbe2499fc4ead90ff47ad471532dcd96d1..3be1d5071bdeb00a6ad568664ad1deee33fe3103 100644

--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc

+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc

@@ -254,10 +254,12 @@ void WebRequestRulesRegistryTest::SetUp() {

ASSERT_TRUE(extension_info_map_.get());

extension_info_map_->AddExtension(extension_.get(),

base::Time() + base::TimeDelta::FromDays(1),

- false /*incognito_enabled*/);

+ false /*incognito_enabled*/,

+ false /*notifications_disabled*/);

extension_info_map_->AddExtension(extension2_.get(),

base::Time() + base::TimeDelta::FromDays(2),

- false /*incognito_enabled*/);

+ false /*incognito_enabled*/,

+ false /*notifications_disabled*/);

}