chrome/browser/extensions/api/declarative_webrequest/webrequest_action_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_action_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/chrome_content_browser_client.cc ('k') | chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_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_action_unittest.cc

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

index ab6ec9adb3022c0a74c019e8ba97cd550cb113ab..b2054cb67c6a672f405415711698debdcc7adee0 100644

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

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

@@ -125,10 +125,14 @@ void WebRequestActionWithThreadsTest::SetUp() {

extension_info_map_ = new InfoMap;

ASSERT_TRUE(extension_info_map_.get());

extension_info_map_->AddExtension(

- extension_.get(), base::Time::Now(), false /*incognito_enabled*/);

+ extension_.get(),

+ base::Time::Now(),

+ false /*incognito_enabled*/,

+ false /*notifications_disabled*/);

extension_info_map_->AddExtension(extension_all_urls_.get(),

base::Time::Now(),

- false /*incognito_enabled*/);

+ false /*incognito_enabled*/,

+ false /*notifications_disabled*/);

}

bool WebRequestActionWithThreadsTest::ActionWorksOnRequest(