Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/strings/string16.h" | 6 #include "base/strings/string16.h" |
| 7 #include "base/strings/string_split.h" | 7 #include "base/strings/string_split.h" |
| 8 #include "base/strings/utf_string_conversions.h" | |
| 8 #include "base/task_scheduler/post_task.h" | 9 #include "base/task_scheduler/post_task.h" |
| 9 #include "chrome/browser/history/history_service_factory.h" | 10 #include "chrome/browser/history/history_service_factory.h" |
| 10 #include "chrome/browser/history/history_test_utils.h" | 11 #include "chrome/browser/history/history_test_utils.h" |
| 11 #include "chrome/browser/prerender/prerender_handle.h" | 12 #include "chrome/browser/prerender/prerender_handle.h" |
| 12 #include "chrome/browser/prerender/prerender_manager.h" | 13 #include "chrome/browser/prerender/prerender_manager.h" |
| 13 #include "chrome/browser/prerender/prerender_manager_factory.h" | 14 #include "chrome/browser/prerender/prerender_manager_factory.h" |
| 14 #include "chrome/browser/prerender/prerender_test_utils.h" | 15 #include "chrome/browser/prerender/prerender_test_utils.h" |
| 15 #include "chrome/browser/profiles/profile.h" | 16 #include "chrome/browser/profiles/profile.h" |
| 16 #include "chrome/browser/task_manager/task_manager_browsertest_util.h" | 17 #include "chrome/browser/task_manager/task_manager_browsertest_util.h" |
| 17 #include "chrome/browser/ui/browser.h" | 18 #include "chrome/browser/ui/browser.h" |
| 18 #include "chrome/browser/ui/browser_commands.h" | 19 #include "chrome/browser/ui/browser_commands.h" |
| 19 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 20 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 20 #include "chrome/common/chrome_switches.h" | 21 #include "chrome/common/chrome_switches.h" |
| 21 #include "chrome/grit/generated_resources.h" | 22 #include "chrome/grit/generated_resources.h" |
| 22 #include "chrome/test/base/ui_test_utils.h" | 23 #include "chrome/test/base/ui_test_utils.h" |
| 24 #include "content/public/browser/service_worker_context.h" | |
| 25 #include "content/public/browser/storage_partition.h" | |
| 23 #include "content/public/common/url_constants.h" | 26 #include "content/public/common/url_constants.h" |
| 24 #include "content/public/test/browser_test_utils.h" | 27 #include "content/public/test/browser_test_utils.h" |
| 25 #include "net/base/escape.h" | 28 #include "net/base/escape.h" |
| 26 #include "net/base/load_flags.h" | 29 #include "net/base/load_flags.h" |
| 27 #include "net/dns/mock_host_resolver.h" | 30 #include "net/dns/mock_host_resolver.h" |
| 28 #include "net/test/embedded_test_server/request_handler_util.h" | 31 #include "net/test/embedded_test_server/request_handler_util.h" |
| 29 #include "testing/gtest/include/gtest/gtest.h" | 32 #include "testing/gtest/include/gtest/gtest.h" |
| 30 #include "ui/base/l10n/l10n_util.h" | 33 #include "ui/base/l10n/l10n_util.h" |
| 31 | 34 |
| 32 using prerender::test_utils::DestructionWaiter; | 35 using prerender::test_utils::DestructionWaiter; |
| 33 using prerender::test_utils::RequestCounter; | 36 using prerender::test_utils::RequestCounter; |
| 34 using prerender::test_utils::TestPrerender; | 37 using prerender::test_utils::TestPrerender; |
| 35 | 38 |
| 39 namespace { | |
| 40 | |
| 41 void ClosureOnUiThread(const base::Closure& callback) { | |
| 42 content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE, | |
| 43 callback); | |
| 44 } | |
| 45 | |
| 46 } // namespace | |
| 47 | |
| 36 namespace prerender { | 48 namespace prerender { |
| 37 | 49 |
| 38 // These URLs used for test resources must be relative with the exception of | 50 // These URLs used for test resources must be relative with the exception of |
| 39 // |kPrefetchLoaderPath|. | 51 // |kPrefetchLoaderPath|. |
| 40 const char kPrefetchImagePage[] = "prerender/prefetch_image.html"; | 52 const char kPrefetchImagePage[] = "prerender/prefetch_image.html"; |
| 41 const char kPrefetchJpeg[] = "prerender/image.jpeg"; | 53 const char kPrefetchJpeg[] = "prerender/image.jpeg"; |
| 42 const char kPrefetchLoaderPath[] = "/prerender/prefetch_loader.html"; | 54 const char kPrefetchLoaderPath[] = "/prerender/prefetch_loader.html"; |
| 43 const char kPrefetchLoopPage[] = "prerender/prefetch_loop.html"; | 55 const char kPrefetchLoopPage[] = "prerender/prefetch_loop.html"; |
| 44 const char kPrefetchMetaCSP[] = "prerender/prefetch_meta_csp.html"; | 56 const char kPrefetchMetaCSP[] = "prerender/prefetch_meta_csp.html"; |
| 45 const char kPrefetchPage[] = "prerender/prefetch_page.html"; | 57 const char kPrefetchPage[] = "prerender/prefetch_page.html"; |
| 46 const char kPrefetchPage2[] = "prerender/prefetch_page2.html"; | 58 const char kPrefetchPage2[] = "prerender/prefetch_page2.html"; |
| 47 const char kPrefetchPng[] = "prerender/image.png"; | 59 const char kPrefetchPng[] = "prerender/image.png"; |
| 48 const char kPrefetchResponseHeaderCSP[] = | 60 const char kPrefetchResponseHeaderCSP[] = |
| 49 "prerender/prefetch_response_csp.html"; | 61 "prerender/prefetch_response_csp.html"; |
| 50 const char kPrefetchScript[] = "prerender/prefetch.js"; | 62 const char kPrefetchScript[] = "prerender/prefetch.js"; |
| 51 const char kPrefetchScript2[] = "prerender/prefetch2.js"; | 63 const char kPrefetchScript2[] = "prerender/prefetch2.js"; |
| 64 const char kServiceWorkerLoader[] = "prerender/service_worker.html"; | |
| 52 const char kPrefetchSubresourceRedirectPage[] = | 65 const char kPrefetchSubresourceRedirectPage[] = |
| 53 "prerender/prefetch_subresource_redirect.html"; | 66 "prerender/prefetch_subresource_redirect.html"; |
| 54 | 67 |
| 55 class NoStatePrefetchBrowserTest | 68 class NoStatePrefetchBrowserTest |
| 56 : public test_utils::PrerenderInProcessBrowserTest { | 69 : public test_utils::PrerenderInProcessBrowserTest { |
| 57 public: | 70 public: |
| 58 NoStatePrefetchBrowserTest() {} | 71 NoStatePrefetchBrowserTest() {} |
| 59 | 72 |
| 60 void SetUpOnMainThread() override { | 73 void SetUpOnMainThread() override { |
| 61 test_utils::PrerenderInProcessBrowserTest::SetUpOnMainThread(); | 74 test_utils::PrerenderInProcessBrowserTest::SetUpOnMainThread(); |
| (...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 529 constexpr net::RequestPriority kExpectedPriority = net::HIGHEST; | 542 constexpr net::RequestPriority kExpectedPriority = net::HIGHEST; |
| 530 #else | 543 #else |
| 531 constexpr net::RequestPriority kExpectedPriority = net::IDLE; | 544 constexpr net::RequestPriority kExpectedPriority = net::IDLE; |
| 532 #endif | 545 #endif |
| 533 EXPECT_EQ(kExpectedPriority, request->priority()); | 546 EXPECT_EQ(kExpectedPriority, request->priority()); |
| 534 })); | 547 })); |
| 535 PrefetchFromFile(kPrefetchPage, FINAL_STATUS_NOSTATE_PREFETCH_FINISHED); | 548 PrefetchFromFile(kPrefetchPage, FINAL_STATUS_NOSTATE_PREFETCH_FINISHED); |
| 536 script_counter.WaitForCount(1); | 549 script_counter.WaitForCount(1); |
| 537 } | 550 } |
| 538 | 551 |
| 552 // Checks that a registered ServiceWorker (SW) without a renderer intercepts a | |
|
falken
2017/01/06 16:17:55
nit: Does "without a renderer" mean the same thing
mattcary
2017/01/09 14:45:42
Done.
| |
| 553 // prefetch request. | |
| 554 IN_PROC_BROWSER_TEST_F(NoStatePrefetchBrowserTest, ServiceWorkerIntercept) { | |
| 555 // Register and launch a SW. | |
| 556 base::string16 expected_title = base::ASCIIToUTF16("SW READY"); | |
| 557 content::TitleWatcher title_watcher(GetActiveWebContents(), expected_title); | |
| 558 ui_test_utils::NavigateToURL( | |
| 559 current_browser(), | |
| 560 src_server()->GetURL(MakeAbsolute(kServiceWorkerLoader))); | |
| 561 EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle()); | |
| 562 | |
| 563 // Stop the SW renderer process. | |
|
falken
2017/01/06 16:17:55
Ditto, I think rather than "stop the renderer proc
| |
| 564 base::RunLoop run_loop; | |
| 565 content::StoragePartition* storage_partation = | |
|
falken
2017/01/06 16:17:55
nit: typo for "partition"
mattcary
2017/01/09 14:45:42
Done.
| |
| 566 content::BrowserContext::GetStoragePartitionForSite( | |
| 567 GetActiveWebContents()->GetBrowserContext(), | |
| 568 src_server()->GetURL(MakeAbsolute(kPrefetchPng))); | |
| 569 storage_partation->GetServiceWorkerContext() | |
| 570 ->StopAllServiceWorkersForOriginWithCallback( | |
| 571 src_server()->GetURL("/"), | |
| 572 base::Bind(&ClosureOnUiThread, run_loop.QuitClosure())); | |
| 573 run_loop.Run(); | |
| 574 | |
| 575 // The SW intercepts kPrefetchPage and replaces it with a body that contains | |
| 576 // an <img> tage for kPrefetchPng. This verifies that the SW ran correctly by | |
| 577 // observing the fetch of the image. | |
| 578 RequestCounter image_counter; | |
| 579 CountRequestFor(kPrefetchPng, &image_counter); | |
| 580 PrefetchFromFile(kPrefetchPage, FINAL_STATUS_NOSTATE_PREFETCH_FINISHED); | |
| 581 image_counter.WaitForCount(1); | |
| 582 } | |
| 583 | |
| 539 } // namespace prerender | 584 } // namespace prerender |
| OLD | NEW |