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

Unified Diff: chrome/browser/extensions/extension_protocols_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
Index: chrome/browser/extensions/extension_protocols_unittest.cc
diff --git a/chrome/browser/extensions/extension_protocols_unittest.cc b/chrome/browser/extensions/extension_protocols_unittest.cc
index ede181d857bba3c2f73c3cdd8d0998611beadc74..0bfa1d74ea4621d28a0c321713d65e8fc1c606a4 100644
--- a/chrome/browser/extensions/extension_protocols_unittest.cc
+++ b/chrome/browser/extensions/extension_protocols_unittest.cc
@@ -165,7 +165,7 @@ TEST_F(ExtensionProtocolTest, IncognitoRequest) {
scoped_refptr<Extension> extension =
CreateTestExtension(cases[i].name, cases[i].incognito_split_mode);
extension_info_map_->AddExtension(
- extension.get(), base::Time::Now(), cases[i].incognito_enabled);
+ extension.get(), base::Time::Now(), cases[i].incognito_enabled, false);
// First test a main frame request.
{
@@ -225,7 +225,10 @@ TEST_F(ExtensionProtocolTest, ComponentResourceRequest) {
SetProtocolHandler(false);
scoped_refptr<Extension> extension = CreateWebStoreExtension();
- extension_info_map_->AddExtension(extension.get(), base::Time::Now(), false);
+ extension_info_map_->AddExtension(extension.get(),
+ base::Time::Now(),
+ false,
+ false);
// First test it with the extension enabled.
{
@@ -259,7 +262,10 @@ TEST_F(ExtensionProtocolTest, ResourceRequestResponseHeaders) {
SetProtocolHandler(false);
scoped_refptr<Extension> extension = CreateTestResponseHeaderExtension();
- extension_info_map_->AddExtension(extension.get(), base::Time::Now(), false);
+ extension_info_map_->AddExtension(extension.get(),
+ base::Time::Now(),
+ false,
+ false);
{
net::URLRequest request(extension->GetResourceURL("test.dat"),
@@ -294,7 +300,10 @@ TEST_F(ExtensionProtocolTest, AllowFrameRequests) {
SetProtocolHandler(false);
scoped_refptr<Extension> extension = CreateTestExtension("foo", false);
- extension_info_map_->AddExtension(extension.get(), base::Time::Now(), false);
+ extension_info_map_->AddExtension(extension.get(),
+ base::Time::Now(),
+ false,
+ false);
// All MAIN_FRAME and SUB_FRAME requests should succeed.
{

Powered by Google App Engine
This is Rietveld 408576698