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

Unified Diff: chrome/browser/extensions/service_worker_apitest.cc

Issue 2009453002: service worker: Don't control a subframe of an insecure context (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: kinuko comments Created 4 years, 6 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
Index: chrome/browser/extensions/service_worker_apitest.cc
diff --git a/chrome/browser/extensions/service_worker_apitest.cc b/chrome/browser/extensions/service_worker_apitest.cc
index 68c6e0a9789a47525be737054d08d074f4a80182..5eeb18989b50894784e5add5bed67a72592d0446 100644
--- a/chrome/browser/extensions/service_worker_apitest.cc
+++ b/chrome/browser/extensions/service_worker_apitest.cc
@@ -23,6 +23,7 @@
#include "content/public/browser/navigation_entry.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/content_switches.h"
+#include "content/public/common/origin_util.h"
#include "content/public/common/page_type.h"
#include "content/public/test/background_sync_test_util.h"
#include "content/public/test/browser_test_utils.h"
@@ -31,6 +32,7 @@
#include "extensions/browser/process_manager.h"
#include "extensions/test/background_page_watcher.h"
#include "extensions/test/extension_test_message_listener.h"
+#include "net/dns/mock_host_resolver.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
namespace extensions {
@@ -632,9 +634,15 @@ IN_PROC_BROWSER_TEST_F(ServiceWorkerTest, WebAccessibleResourcesIframeSrc) {
kFlagNone);
ASSERT_TRUE(extension);
ASSERT_TRUE(StartEmbeddedTestServer());
- GURL page_url = embedded_test_server()->GetURL(
- "/extensions/api_test/service_worker/web_accessible_resources/"
- "webpage.html");
+
+ // Extension service workers must be able to control insecure contexts. So set
Devlin 2016/06/06 15:20:57 I don't quite understand this comment. I'm assumi
Marijn Kruisselbrink 2016/06/06 17:31:20 An iframe within an insecure context is itself an
falken 2016/06/07 01:15:30 Thanks, I revised the comment. What do you think?
+ // up an insecure URL.
+ host_resolver()->AddRule("a.com", "127.0.0.1");
+ GURL page_url =
+ embedded_test_server()->GetURL("a.com",
+ "/extensions/api_test/service_worker/"
+ "web_accessible_resources/webpage.html");
+ EXPECT_FALSE(content::IsOriginSecure(page_url));
content::WebContents* web_contents = AddTab(browser(), page_url);
std::string result;
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | content/browser/service_worker/service_worker_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698