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

Side by Side Diff: chrome/browser/prerender/prerender_nostate_prefetch_browsertest.cc

Issue 2575523002: Prerender: Confirm ServiceWorkers are invoked for NoState Prefetch (Closed)
Patch Set: Check that SW runs rather than disabling Created 3 years, 11 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 (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/task_scheduler/post_task.h" 8 #include "base/task_scheduler/post_task.h"
9 #include "chrome/browser/history/history_service_factory.h" 9 #include "chrome/browser/history/history_service_factory.h"
10 #include "chrome/browser/history/history_test_utils.h" 10 #include "chrome/browser/history/history_test_utils.h"
11 #include "chrome/browser/prerender/prerender_handle.h" 11 #include "chrome/browser/prerender/prerender_handle.h"
12 #include "chrome/browser/prerender/prerender_manager.h" 12 #include "chrome/browser/prerender/prerender_manager.h"
13 #include "chrome/browser/prerender/prerender_manager_factory.h" 13 #include "chrome/browser/prerender/prerender_manager_factory.h"
14 #include "chrome/browser/prerender/prerender_test_utils.h" 14 #include "chrome/browser/prerender/prerender_test_utils.h"
15 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/task_manager/task_manager_browsertest_util.h" 16 #include "chrome/browser/task_manager/task_manager_browsertest_util.h"
17 #include "chrome/browser/ui/browser.h" 17 #include "chrome/browser/ui/browser.h"
18 #include "chrome/browser/ui/browser_commands.h" 18 #include "chrome/browser/ui/browser_commands.h"
19 #include "chrome/browser/ui/tabs/tab_strip_model.h" 19 #include "chrome/browser/ui/tabs/tab_strip_model.h"
20 #include "chrome/common/chrome_switches.h" 20 #include "chrome/common/chrome_switches.h"
21 #include "chrome/grit/generated_resources.h" 21 #include "chrome/grit/generated_resources.h"
22 #include "chrome/test/base/ui_test_utils.h" 22 #include "chrome/test/base/ui_test_utils.h"
23 #include "content/public/browser/service_worker_context.h"
24 #include "content/public/browser/storage_partition.h"
23 #include "content/public/common/url_constants.h" 25 #include "content/public/common/url_constants.h"
24 #include "content/public/test/browser_test_utils.h" 26 #include "content/public/test/browser_test_utils.h"
25 #include "net/base/escape.h" 27 #include "net/base/escape.h"
26 #include "net/base/load_flags.h" 28 #include "net/base/load_flags.h"
27 #include "net/dns/mock_host_resolver.h" 29 #include "net/dns/mock_host_resolver.h"
28 #include "net/test/embedded_test_server/request_handler_util.h" 30 #include "net/test/embedded_test_server/request_handler_util.h"
29 #include "testing/gtest/include/gtest/gtest.h" 31 #include "testing/gtest/include/gtest/gtest.h"
30 #include "ui/base/l10n/l10n_util.h" 32 #include "ui/base/l10n/l10n_util.h"
31 33
32 using prerender::test_utils::DestructionWaiter; 34 using prerender::test_utils::DestructionWaiter;
33 using prerender::test_utils::RequestCounter; 35 using prerender::test_utils::RequestCounter;
34 using prerender::test_utils::TestPrerender; 36 using prerender::test_utils::TestPrerender;
35 37
38 namespace {
pasko 2017/01/02 18:15:36 nit: empty line after namespace for function decla
mattcary 2017/01/03 08:43:20 Done.
39 void ClosureOnUiThread(const base::Closure& callback) {
40 content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
41 callback);
42 }
43 } // namespace
pasko 2017/01/02 18:15:36 nit: git grep -B 2 '} // namespace$'
mattcary 2017/01/03 08:43:20 Done.
44
36 namespace prerender { 45 namespace prerender {
37 46
38 // These URLs used for test resources must be relative with the exception of 47 // These URLs used for test resources must be relative with the exception of
39 // |kPrefetchLoaderPath|. 48 // |kPrefetchLoaderPath|.
40 const char kPrefetchImagePage[] = "prerender/prefetch_image.html"; 49 const char kPrefetchImagePage[] = "prerender/prefetch_image.html";
41 const char kPrefetchJpeg[] = "prerender/image.jpeg"; 50 const char kPrefetchJpeg[] = "prerender/image.jpeg";
42 const char kPrefetchLoaderPath[] = "/prerender/prefetch_loader.html"; 51 const char kPrefetchLoaderPath[] = "/prerender/prefetch_loader.html";
43 const char kPrefetchLoopPage[] = "prerender/prefetch_loop.html"; 52 const char kPrefetchLoopPage[] = "prerender/prefetch_loop.html";
44 const char kPrefetchMetaCSP[] = "prerender/prefetch_meta_csp.html"; 53 const char kPrefetchMetaCSP[] = "prerender/prefetch_meta_csp.html";
45 const char kPrefetchPage[] = "prerender/prefetch_page.html"; 54 const char kPrefetchPage[] = "prerender/prefetch_page.html";
46 const char kPrefetchPage2[] = "prerender/prefetch_page2.html"; 55 const char kPrefetchPage2[] = "prerender/prefetch_page2.html";
47 const char kPrefetchPng[] = "prerender/image.png"; 56 const char kPrefetchPng[] = "prerender/image.png";
48 const char kPrefetchResponseHeaderCSP[] = 57 const char kPrefetchResponseHeaderCSP[] =
49 "prerender/prefetch_response_csp.html"; 58 "prerender/prefetch_response_csp.html";
50 const char kPrefetchScript[] = "prerender/prefetch.js"; 59 const char kPrefetchScript[] = "prerender/prefetch.js";
51 const char kPrefetchScript2[] = "prerender/prefetch2.js"; 60 const char kPrefetchScript2[] = "prerender/prefetch2.js";
61 const char kServiceWorkerLoader[] = "prerender/service_worker.html";
62 const char kServiceWorkerJavascript[] = "prerender/service_worker.js";
52 const char kPrefetchSubresourceRedirectPage[] = 63 const char kPrefetchSubresourceRedirectPage[] =
53 "prerender/prefetch_subresource_redirect.html"; 64 "prerender/prefetch_subresource_redirect.html";
54 65
55 class NoStatePrefetchBrowserTest 66 class NoStatePrefetchBrowserTest
56 : public test_utils::PrerenderInProcessBrowserTest { 67 : public test_utils::PrerenderInProcessBrowserTest {
57 public: 68 public:
58 NoStatePrefetchBrowserTest() {} 69 NoStatePrefetchBrowserTest() {}
59 70
60 void SetUpOnMainThread() override { 71 void SetUpOnMainThread() override {
61 test_utils::PrerenderInProcessBrowserTest::SetUpOnMainThread(); 72 test_utils::PrerenderInProcessBrowserTest::SetUpOnMainThread();
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
507 constexpr net::RequestPriority kExpectedPriority = net::HIGHEST; 518 constexpr net::RequestPriority kExpectedPriority = net::HIGHEST;
508 #else 519 #else
509 constexpr net::RequestPriority kExpectedPriority = net::IDLE; 520 constexpr net::RequestPriority kExpectedPriority = net::IDLE;
510 #endif 521 #endif
511 EXPECT_EQ(kExpectedPriority, request->priority()); 522 EXPECT_EQ(kExpectedPriority, request->priority());
512 })); 523 }));
513 PrefetchFromFile(kPrefetchPage, FINAL_STATUS_NOSTATE_PREFETCH_FINISHED); 524 PrefetchFromFile(kPrefetchPage, FINAL_STATUS_NOSTATE_PREFETCH_FINISHED);
514 script_counter.WaitForCount(1); 525 script_counter.WaitForCount(1);
515 } 526 }
516 527
528 // Checks that a registered ServiceWorker (SW) without a renderer intercepts a
529 // prefetch request.
530 IN_PROC_BROWSER_TEST_F(NoStatePrefetchBrowserTest, ServiceWorkerIntercept) {
531 // Register and launch a SW.
pasko 2017/01/02 18:15:36 Is it easy to add a similar test, but for the case
mattcary 2017/01/03 08:43:20 Yes, in fact the other tests already do that (if p
532 RequestCounter sw_counter;
533 CountRequestFor(kServiceWorkerJavascript, &sw_counter);
534 ui_test_utils::NavigateToURL(
535 current_browser(),
536 src_server()->GetURL(MakeAbsolute(kServiceWorkerLoader)));
537 sw_counter.WaitForCount(1);
538
539 // Stop the SW renderer process.
540 base::RunLoop run_loop;
541 content::BrowserContext::GetStoragePartitionForSite(
542 GetActiveWebContents()->GetBrowserContext(),
543 src_server()->GetURL(MakeAbsolute(kPrefetchPng)))
pasko 2017/01/02 18:15:36 nit: hard to count brackets, formatting does not h
mattcary 2017/01/03 08:43:19 Done.
544 ->GetServiceWorkerContext()
545 ->StopAllServiceWorkersForOriginWithCallback(
546 src_server()->GetURL("/"),
547 base::Bind(&ClosureOnUiThread, run_loop.QuitClosure()));
pasko 2017/01/02 18:15:36 why not just run_loop.QuitClosure()? // i.e. witho
mattcary 2017/01/03 08:43:19 The SW callback fires from the IO thread.
pasko 2017/01/03 13:09:14 Thanks. I did not know that.
548 run_loop.Run();
549
550 // The SW intercepts kPrefetchPage and replaces it with a body that contains
551 // an <img> tage for kPrefetchPng. We verify that the SW ran correctly by
pasko 2017/01/02 18:15:36 s/We verify/Verify/ (we prefer to avoid 'we' in co
mattcary 2017/01/03 08:43:20 Done, although git grep -i ' we ' | grep cc | head
552 // observing the fetch of the image.
553 RequestCounter image_counter;
554 CountRequestFor(kPrefetchPng, &image_counter);
555 PrefetchFromFile(kPrefetchPage, FINAL_STATUS_NOSTATE_PREFETCH_FINISHED);
556 image_counter.WaitForCount(1);
557 }
558
517 } // namespace prerender 559 } // namespace prerender
OLDNEW
« no previous file with comments | « no previous file | chrome/test/data/prerender/service_worker.html » ('j') | chrome/test/data/prerender/service_worker.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698