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/json/json_string_value_serializer.h" | 5 #include "base/json/json_string_value_serializer.h" |
| 6 #include "base/prefs/pref_service.h" | 6 #include "base/prefs/pref_service.h" |
| 7 #include "chrome/browser/net/predictor.h" | 7 #include "chrome/browser/net/predictor.h" |
| 8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
| 9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/common/pref_names.h" | 10 #include "chrome/common/pref_names.h" |
| 11 #include "chrome/test/base/in_process_browser_test.h" | 11 #include "chrome/test/base/in_process_browser_test.h" |
| 12 #include "chrome/test/base/ui_test_utils.h" | |
| 12 #include "content/public/test/test_utils.h" | 13 #include "content/public/test/test_utils.h" |
| 13 #include "net/base/net_errors.h" | 14 #include "net/base/net_errors.h" |
| 14 #include "net/dns/host_resolver_proc.h" | 15 #include "net/dns/host_resolver_proc.h" |
| 15 #include "net/dns/mock_host_resolver.h" | 16 #include "net/dns/mock_host_resolver.h" |
| 16 #include "testing/gmock/include/gmock/gmock.h" | 17 #include "testing/gmock/include/gmock/gmock.h" |
| 17 | 18 |
| 18 using content::BrowserThread; | 19 using content::BrowserThread; |
| 19 using testing::HasSubstr; | 20 using testing::HasSubstr; |
| 20 | 21 |
| 21 namespace { | 22 namespace { |
| 22 | 23 |
| 24 const char[] kChromiumHostname = "chromium.org"; | |
| 25 | |
| 23 // Records a history of all hostnames for which resolving has been requested, | 26 // Records a history of all hostnames for which resolving has been requested, |
| 24 // and immediately fails the resolution requests themselves. | 27 // and immediately fails the resolution requests themselves. |
| 25 class HostResolutionRequestRecorder : public net::HostResolverProc { | 28 class HostResolutionRequestRecorder : public net::HostResolverProc { |
| 26 public: | 29 public: |
| 27 HostResolutionRequestRecorder() | 30 HostResolutionRequestRecorder() |
| 28 : HostResolverProc(NULL), | 31 : HostResolverProc(NULL), |
| 29 is_waiting_for_hostname_(false) { | 32 is_waiting_for_hostname_(false) { |
| 30 } | 33 } |
| 31 | 34 |
| 32 int Resolve(const std::string& host, | 35 int Resolve(const std::string& host, |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 98 : startup_url_("http://host1:1"), | 101 : startup_url_("http://host1:1"), |
| 99 referring_url_("http://host2:1"), | 102 referring_url_("http://host2:1"), |
| 100 target_url_("http://host3:1"), | 103 target_url_("http://host3:1"), |
| 101 host_resolution_request_recorder_(new HostResolutionRequestRecorder) { | 104 host_resolution_request_recorder_(new HostResolutionRequestRecorder) { |
| 102 } | 105 } |
| 103 | 106 |
| 104 protected: | 107 protected: |
| 105 void SetUpInProcessBrowserTestFixture() override { | 108 void SetUpInProcessBrowserTestFixture() override { |
| 106 scoped_host_resolver_proc_.reset(new net::ScopedDefaultHostResolverProc( | 109 scoped_host_resolver_proc_.reset(new net::ScopedDefaultHostResolverProc( |
| 107 host_resolution_request_recorder_.get())); | 110 host_resolution_request_recorder_.get())); |
| 111 ASSERT_TRUE(test_server()->Start()); | |
|
Nico
2015/02/06 02:06:47
(if you only need this in that one test, consider
gunsch
2015/02/06 02:10:10
Done.
| |
| 108 InProcessBrowserTest::SetUpInProcessBrowserTestFixture(); | 112 InProcessBrowserTest::SetUpInProcessBrowserTestFixture(); |
| 109 } | 113 } |
| 110 | 114 |
| 111 void TearDownInProcessBrowserTestFixture() override { | 115 void TearDownInProcessBrowserTestFixture() override { |
| 112 InProcessBrowserTest::TearDownInProcessBrowserTestFixture(); | 116 InProcessBrowserTest::TearDownInProcessBrowserTestFixture(); |
| 113 scoped_host_resolver_proc_.reset(); | 117 scoped_host_resolver_proc_.reset(); |
| 114 } | 118 } |
| 115 | 119 |
| 116 void LearnAboutInitialNavigation(const GURL& url) { | 120 void LearnAboutInitialNavigation(const GURL& url) { |
| 117 Predictor* predictor = browser()->profile()->GetNetworkPredictor(); | 121 Predictor* predictor = browser()->profile()->GetNetworkPredictor(); |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 182 EXPECT_THAT(cleared_referral_list, Not(HasSubstr(referring_url_.host()))); | 186 EXPECT_THAT(cleared_referral_list, Not(HasSubstr(referring_url_.host()))); |
| 183 EXPECT_THAT(cleared_referral_list, Not(HasSubstr(target_url_.host()))); | 187 EXPECT_THAT(cleared_referral_list, Not(HasSubstr(target_url_.host()))); |
| 184 | 188 |
| 185 // But also make sure this data has been first loaded into the Predictor, by | 189 // But also make sure this data has been first loaded into the Predictor, by |
| 186 // inspecting that the Predictor starts making the expected hostname requests. | 190 // inspecting that the Predictor starts making the expected hostname requests. |
| 187 PrepareFrameSubresources(referring_url_); | 191 PrepareFrameSubresources(referring_url_); |
| 188 WaitUntilHostHasBeenRequested(startup_url_.host()); | 192 WaitUntilHostHasBeenRequested(startup_url_.host()); |
| 189 WaitUntilHostHasBeenRequested(target_url_.host()); | 193 WaitUntilHostHasBeenRequested(target_url_.host()); |
| 190 } | 194 } |
| 191 | 195 |
| 196 IN_PROC_BROWSER_TEST_F(PredictorBrowserTest, DnsPrefetch) { | |
| 197 ui_test_utils::NavigateToURL( | |
| 198 browser(), | |
| 199 GURL(test_server()->GetURL("files/predictor/dns_prefetch.html"))); | |
| 200 WaitUntilHostHasBeenRequested(kChromiumHostname); | |
| 201 } | |
| 202 | |
| 192 } // namespace chrome_browser_net | 203 } // namespace chrome_browser_net |
| 193 | 204 |
| OLD | NEW |