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 <stddef.h> | 5 #include <stddef.h> |
6 #include <stdint.h> | 6 #include <stdint.h> |
7 | 7 |
8 #include <algorithm> | 8 #include <algorithm> |
9 #include <map> | 9 #include <map> |
10 #include <memory> | 10 #include <memory> |
11 #include <set> | 11 #include <set> |
12 | 12 |
13 #include "base/base64.h" | 13 #include "base/base64.h" |
14 #include "base/bind.h" | 14 #include "base/bind.h" |
15 #include "base/callback.h" | 15 #include "base/callback.h" |
16 #include "base/command_line.h" | 16 #include "base/command_line.h" |
17 #include "base/json/json_string_value_serializer.h" | 17 #include "base/json/json_string_value_serializer.h" |
18 #include "base/macros.h" | 18 #include "base/macros.h" |
19 #include "base/memory/ptr_util.h" | 19 #include "base/memory/ptr_util.h" |
20 #include "base/memory/ref_counted.h" | 20 #include "base/memory/ref_counted.h" |
21 #include "base/message_loop/message_loop.h" | 21 #include "base/message_loop/message_loop.h" |
22 #include "base/run_loop.h" | 22 #include "base/run_loop.h" |
23 #include "base/single_thread_task_runner.h" | 23 #include "base/single_thread_task_runner.h" |
24 #include "base/stl_util.h" | 24 #include "base/stl_util.h" |
25 #include "base/synchronization/lock.h" | 25 #include "base/synchronization/lock.h" |
| 26 #include "base/test/scoped_feature_list.h" |
26 #include "base/threading/thread_task_runner_handle.h" | 27 #include "base/threading/thread_task_runner_handle.h" |
27 #include "build/build_config.h" | 28 #include "build/build_config.h" |
28 #include "chrome/browser/browser_process.h" | 29 #include "chrome/browser/browser_process.h" |
29 #include "chrome/browser/browsing_data/browsing_data_helper.h" | 30 #include "chrome/browser/browsing_data/browsing_data_helper.h" |
30 #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h" | 31 #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h" |
31 #include "chrome/browser/net/predictor.h" | 32 #include "chrome/browser/net/predictor.h" |
32 #include "chrome/browser/profiles/profile.h" | 33 #include "chrome/browser/profiles/profile.h" |
33 #include "chrome/browser/ui/browser.h" | 34 #include "chrome/browser/ui/browser.h" |
34 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 35 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 36 #include "chrome/common/chrome_features.h" |
35 #include "chrome/common/pref_names.h" | 37 #include "chrome/common/pref_names.h" |
36 #include "chrome/test/base/in_process_browser_test.h" | 38 #include "chrome/test/base/in_process_browser_test.h" |
37 #include "chrome/test/base/ui_test_utils.h" | 39 #include "chrome/test/base/ui_test_utils.h" |
38 #include "components/prefs/pref_service.h" | 40 #include "components/prefs/pref_service.h" |
39 #include "content/public/browser/browsing_data_remover.h" | 41 #include "content/public/browser/browsing_data_remover.h" |
40 #include "content/public/common/content_switches.h" | 42 #include "content/public/common/content_switches.h" |
41 #include "content/public/test/browser_test_utils.h" | 43 #include "content/public/test/browser_test_utils.h" |
42 #include "content/public/test/test_utils.h" | 44 #include "content/public/test/test_utils.h" |
43 #include "net/base/host_port_pair.h" | 45 #include "net/base/host_port_pair.h" |
44 #include "net/base/ip_endpoint.h" | 46 #include "net/base/ip_endpoint.h" |
(...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
502 rule_based_resolver_proc_->AddRuleWithLatency("www.example.test", | 504 rule_based_resolver_proc_->AddRuleWithLatency("www.example.test", |
503 "127.0.0.1", 50); | 505 "127.0.0.1", 50); |
504 rule_based_resolver_proc_->AddRuleWithLatency("gmail.google.com", | 506 rule_based_resolver_proc_->AddRuleWithLatency("gmail.google.com", |
505 "127.0.0.1", 70); | 507 "127.0.0.1", 70); |
506 rule_based_resolver_proc_->AddRuleWithLatency("mail.google.com", | 508 rule_based_resolver_proc_->AddRuleWithLatency("mail.google.com", |
507 "127.0.0.1", 44); | 509 "127.0.0.1", 44); |
508 rule_based_resolver_proc_->AddRuleWithLatency("gmail.com", "127.0.0.1", 63); | 510 rule_based_resolver_proc_->AddRuleWithLatency("gmail.com", "127.0.0.1", 63); |
509 rule_based_resolver_proc_->AddSimulatedFailure("*.notfound"); | 511 rule_based_resolver_proc_->AddSimulatedFailure("*.notfound"); |
510 rule_based_resolver_proc_->AddRuleWithLatency("delay.google.com", | 512 rule_based_resolver_proc_->AddRuleWithLatency("delay.google.com", |
511 "127.0.0.1", 1000 * 60); | 513 "127.0.0.1", 1000 * 60); |
| 514 scoped_feature_list_.InitAndEnableFeature(features::kPreconnectMore); |
512 } | 515 } |
513 | 516 |
514 protected: | 517 protected: |
515 void SetUpInProcessBrowserTestFixture() override { | 518 void SetUpInProcessBrowserTestFixture() override { |
516 scoped_host_resolver_proc_.reset(new net::ScopedDefaultHostResolverProc( | 519 scoped_host_resolver_proc_.reset(new net::ScopedDefaultHostResolverProc( |
517 rule_based_resolver_proc_.get())); | 520 rule_based_resolver_proc_.get())); |
518 } | 521 } |
519 | 522 |
520 void SetUpCommandLine(base::CommandLine* command_line) override { | 523 void SetUpCommandLine(base::CommandLine* command_line) override { |
521 command_line->AppendSwitch( | 524 command_line->AppendSwitch( |
522 switches::kEnableExperimentalWebPlatformFeatures); | 525 switches::kEnableExperimentalWebPlatformFeatures); |
523 command_line->AppendSwitchASCII(switches::kEnableFeatures, | |
524 "PreconnectMore"); | |
525 } | 526 } |
526 | 527 |
527 void SetUpOnMainThread() override { | 528 void SetUpOnMainThread() override { |
528 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 529 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
529 task_runner_ = base::ThreadTaskRunnerHandle::Get(); | 530 task_runner_ = base::ThreadTaskRunnerHandle::Get(); |
530 cross_site_test_server()->ServeFilesFromSourceDirectory( | 531 cross_site_test_server()->ServeFilesFromSourceDirectory( |
531 "chrome/test/data/"); | 532 "chrome/test/data/"); |
532 | 533 |
533 connection_listener_.reset(new ConnectionListener()); | 534 connection_listener_.reset(new ConnectionListener()); |
534 cross_site_connection_listener_.reset(new ConnectionListener()); | 535 cross_site_connection_listener_.reset(new ConnectionListener()); |
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
790 std::unique_ptr<ConnectionListener> connection_listener_; | 791 std::unique_ptr<ConnectionListener> connection_listener_; |
791 std::unique_ptr<ConnectionListener> cross_site_connection_listener_; | 792 std::unique_ptr<ConnectionListener> cross_site_connection_listener_; |
792 | 793 |
793 private: | 794 private: |
794 scoped_refptr<net::RuleBasedHostResolverProc> rule_based_resolver_proc_; | 795 scoped_refptr<net::RuleBasedHostResolverProc> rule_based_resolver_proc_; |
795 std::unique_ptr<net::ScopedDefaultHostResolverProc> | 796 std::unique_ptr<net::ScopedDefaultHostResolverProc> |
796 scoped_host_resolver_proc_; | 797 scoped_host_resolver_proc_; |
797 std::unique_ptr<net::EmbeddedTestServer> cross_site_test_server_; | 798 std::unique_ptr<net::EmbeddedTestServer> cross_site_test_server_; |
798 std::unique_ptr<CrossSitePredictorObserver> observer_; | 799 std::unique_ptr<CrossSitePredictorObserver> observer_; |
799 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; | 800 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; |
| 801 base::test::ScopedFeatureList scoped_feature_list_; |
800 }; | 802 }; |
801 | 803 |
802 IN_PROC_BROWSER_TEST_F(PredictorBrowserTest, SingleLookupTest) { | 804 IN_PROC_BROWSER_TEST_F(PredictorBrowserTest, SingleLookupTest) { |
803 DiscardAllResultsOnUIThread(); | 805 DiscardAllResultsOnUIThread(); |
804 GURL url("http://www.example.test/"); | 806 GURL url("http://www.example.test/"); |
805 | 807 |
806 // Try to flood the predictor with many concurrent requests. | 808 // Try to flood the predictor with many concurrent requests. |
807 std::vector<GURL> names{url}; | 809 std::vector<GURL> names{url}; |
808 FloodResolveRequestsOnUIThread(names); | 810 FloodResolveRequestsOnUIThread(names); |
809 observer()->WaitUntilHostLookedUp(url); | 811 observer()->WaitUntilHostLookedUp(url); |
(...skipping 775 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1585 // Second navigation to content with an img. | 1587 // Second navigation to content with an img. |
1586 std::string img_content = | 1588 std::string img_content = |
1587 "<img src=\"" + preconnect_url.spec() + "test.gif\">"; | 1589 "<img src=\"" + preconnect_url.spec() + "test.gif\">"; |
1588 NavigateToDataURLWithContent(img_content); | 1590 NavigateToDataURLWithContent(img_content); |
1589 connection_listener_->WaitUntilFirstConnectionRead(); | 1591 connection_listener_->WaitUntilFirstConnectionRead(); |
1590 EXPECT_EQ(2u, connection_listener_->GetAcceptedSocketCount()); | 1592 EXPECT_EQ(2u, connection_listener_->GetAcceptedSocketCount()); |
1591 EXPECT_EQ(1u, connection_listener_->GetReadSocketCount()); | 1593 EXPECT_EQ(1u, connection_listener_->GetReadSocketCount()); |
1592 } | 1594 } |
1593 | 1595 |
1594 } // namespace chrome_browser_net | 1596 } // namespace chrome_browser_net |
OLD | NEW |