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

Side by Side Diff: content/browser/service_worker/service_worker_browsertest.cc

Issue 2226363002: Track subresources with cert errors separately from mixed content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add comments Created 4 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 #include <utility> 10 #include <utility>
(...skipping 20 matching lines...) Expand all
31 #include "content/browser/service_worker/embedded_worker_instance.h" 31 #include "content/browser/service_worker/embedded_worker_instance.h"
32 #include "content/browser/service_worker/embedded_worker_registry.h" 32 #include "content/browser/service_worker/embedded_worker_registry.h"
33 #include "content/browser/service_worker/embedded_worker_status.h" 33 #include "content/browser/service_worker/embedded_worker_status.h"
34 #include "content/browser/service_worker/service_worker_context_core.h" 34 #include "content/browser/service_worker/service_worker_context_core.h"
35 #include "content/browser/service_worker/service_worker_context_observer.h" 35 #include "content/browser/service_worker/service_worker_context_observer.h"
36 #include "content/browser/service_worker/service_worker_context_wrapper.h" 36 #include "content/browser/service_worker/service_worker_context_wrapper.h"
37 #include "content/browser/service_worker/service_worker_fetch_dispatcher.h" 37 #include "content/browser/service_worker/service_worker_fetch_dispatcher.h"
38 #include "content/browser/service_worker/service_worker_registration.h" 38 #include "content/browser/service_worker/service_worker_registration.h"
39 #include "content/browser/service_worker/service_worker_test_utils.h" 39 #include "content/browser/service_worker/service_worker_test_utils.h"
40 #include "content/browser/service_worker/service_worker_version.h" 40 #include "content/browser/service_worker/service_worker_version.h"
41 #include "content/browser/web_contents/web_contents_impl.h"
41 #include "content/common/service_worker/service_worker_messages.h" 42 #include "content/common/service_worker/service_worker_messages.h"
42 #include "content/common/service_worker/service_worker_status_code.h" 43 #include "content/common/service_worker/service_worker_status_code.h"
43 #include "content/common/service_worker/service_worker_types.h" 44 #include "content/common/service_worker/service_worker_types.h"
44 #include "content/public/browser/browser_context.h" 45 #include "content/public/browser/browser_context.h"
45 #include "content/public/browser/browser_thread.h" 46 #include "content/public/browser/browser_thread.h"
46 #include "content/public/browser/content_browser_client.h" 47 #include "content/public/browser/content_browser_client.h"
47 #include "content/public/browser/navigation_entry.h" 48 #include "content/public/browser/navigation_entry.h"
48 #include "content/public/browser/render_process_host.h" 49 #include "content/public/browser/render_process_host.h"
49 #include "content/public/browser/render_view_host.h" 50 #include "content/public/browser/render_view_host.h"
50 #include "content/public/browser/storage_partition.h" 51 #include "content/public/browser/storage_partition.h"
(...skipping 1317 matching lines...) Expand 10 before | Expand all | Expand 10 after
1368 public_context()->RegisterServiceWorker( 1369 public_context()->RegisterServiceWorker(
1369 https_server.GetURL(kPageUrl), 1370 https_server.GetURL(kPageUrl),
1370 https_server.GetURL(kWorkerUrl), 1371 https_server.GetURL(kWorkerUrl),
1371 base::Bind(&ExpectResultAndRun, true, base::Bind(&base::DoNothing))); 1372 base::Bind(&ExpectResultAndRun, true, base::Bind(&base::DoNothing)));
1372 observer->Wait(); 1373 observer->Wait();
1373 1374
1374 const base::string16 title = base::ASCIIToUTF16("Title"); 1375 const base::string16 title = base::ASCIIToUTF16("Title");
1375 TitleWatcher title_watcher(shell()->web_contents(), title); 1376 TitleWatcher title_watcher(shell()->web_contents(), title);
1376 NavigateToURL(shell(), https_server.GetURL(kPageUrl)); 1377 NavigateToURL(shell(), https_server.GetURL(kPageUrl));
1377 EXPECT_EQ(title, title_watcher.WaitAndGetTitle()); 1378 EXPECT_EQ(title, title_watcher.WaitAndGetTitle());
1378 EXPECT_FALSE(shell()->web_contents()->DisplayedInsecureContent()); 1379 EXPECT_FALSE(static_cast<WebContentsImpl*>(shell()->web_contents())
1380 ->DisplayedInsecureContent());
1379 NavigationEntry* entry = 1381 NavigationEntry* entry =
1380 shell()->web_contents()->GetController().GetVisibleEntry(); 1382 shell()->web_contents()->GetController().GetVisibleEntry();
1381 EXPECT_EQ(SECURITY_STYLE_AUTHENTICATED, entry->GetSSL().security_style); 1383 EXPECT_EQ(SECURITY_STYLE_AUTHENTICATED, entry->GetSSL().security_style);
1382 1384
1383 shell()->Close(); 1385 shell()->Close();
1384 1386
1385 base::RunLoop run_loop; 1387 base::RunLoop run_loop;
1386 public_context()->UnregisterServiceWorker( 1388 public_context()->UnregisterServiceWorker(
1387 https_server.GetURL(kPageUrl), 1389 https_server.GetURL(kPageUrl),
1388 base::Bind(&ExpectResultAndRun, true, run_loop.QuitClosure())); 1390 base::Bind(&ExpectResultAndRun, true, run_loop.QuitClosure()));
(...skipping 10 matching lines...) Expand all
1399 public_context()->RegisterServiceWorker( 1401 public_context()->RegisterServiceWorker(
1400 embedded_test_server()->GetURL(kPageUrl), 1402 embedded_test_server()->GetURL(kPageUrl),
1401 embedded_test_server()->GetURL(kWorkerUrl), 1403 embedded_test_server()->GetURL(kWorkerUrl),
1402 base::Bind(&ExpectResultAndRun, true, base::Bind(&base::DoNothing))); 1404 base::Bind(&ExpectResultAndRun, true, base::Bind(&base::DoNothing)));
1403 observer->Wait(); 1405 observer->Wait();
1404 1406
1405 const base::string16 title = base::ASCIIToUTF16("Title"); 1407 const base::string16 title = base::ASCIIToUTF16("Title");
1406 TitleWatcher title_watcher(shell()->web_contents(), title); 1408 TitleWatcher title_watcher(shell()->web_contents(), title);
1407 NavigateToURL(shell(), embedded_test_server()->GetURL(kPageUrl)); 1409 NavigateToURL(shell(), embedded_test_server()->GetURL(kPageUrl));
1408 EXPECT_EQ(title, title_watcher.WaitAndGetTitle()); 1410 EXPECT_EQ(title, title_watcher.WaitAndGetTitle());
1409 EXPECT_FALSE(shell()->web_contents()->DisplayedInsecureContent()); 1411 EXPECT_FALSE(static_cast<WebContentsImpl*>(shell()->web_contents())
1412 ->DisplayedInsecureContent());
1410 NavigationEntry* entry = 1413 NavigationEntry* entry =
1411 shell()->web_contents()->GetController().GetVisibleEntry(); 1414 shell()->web_contents()->GetController().GetVisibleEntry();
1412 EXPECT_EQ(SECURITY_STYLE_UNAUTHENTICATED, entry->GetSSL().security_style); 1415 EXPECT_EQ(SECURITY_STYLE_UNAUTHENTICATED, entry->GetSSL().security_style);
1413 1416
1414 shell()->Close(); 1417 shell()->Close();
1415 1418
1416 base::RunLoop run_loop; 1419 base::RunLoop run_loop;
1417 public_context()->UnregisterServiceWorker( 1420 public_context()->UnregisterServiceWorker(
1418 embedded_test_server()->GetURL(kPageUrl), 1421 embedded_test_server()->GetURL(kPageUrl),
1419 base::Bind(&ExpectResultAndRun, true, run_loop.QuitClosure())); 1422 base::Bind(&ExpectResultAndRun, true, run_loop.QuitClosure()));
(...skipping 602 matching lines...) Expand 10 before | Expand all | Expand 10 after
2022 2025
2023 IN_PROC_BROWSER_TEST_F(ServiceWorkerDisableWebSecurityTest, UpdateNoCrash) { 2026 IN_PROC_BROWSER_TEST_F(ServiceWorkerDisableWebSecurityTest, UpdateNoCrash) {
2024 const char kPageUrl[] = "/service_worker/disable_web_security_update.html"; 2027 const char kPageUrl[] = "/service_worker/disable_web_security_update.html";
2025 const char kScopeUrl[] = "/service_worker/scope/"; 2028 const char kScopeUrl[] = "/service_worker/scope/";
2026 const char kWorkerUrl[] = "/service_worker/fetch_event_blob.js"; 2029 const char kWorkerUrl[] = "/service_worker/fetch_event_blob.js";
2027 RegisterServiceWorkerOnCrossOriginServer(kScopeUrl, kWorkerUrl); 2030 RegisterServiceWorkerOnCrossOriginServer(kScopeUrl, kWorkerUrl);
2028 RunTestWithCrossOriginURL(kPageUrl, kScopeUrl); 2031 RunTestWithCrossOriginURL(kPageUrl, kScopeUrl);
2029 } 2032 }
2030 2033
2031 } // namespace content 2034 } // namespace content
OLDNEW
« no previous file with comments | « chrome/browser/ssl/ssl_browser_tests.cc ('k') | content/browser/site_per_process_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698