| OLD | NEW | 
|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "chrome/browser/net/net_error_tab_helper.h" | 5 #include "chrome/browser/net/net_error_tab_helper.h" | 
| 6 | 6 | 
| 7 #include "chrome/common/net/net_error_info.h" | 7 #include "chrome/common/net/net_error_info.h" | 
| 8 #include "chrome/test/base/chrome_render_view_host_test_harness.h" | 8 #include "chrome/test/base/chrome_render_view_host_test_harness.h" | 
| 9 #include "content/public/browser/browser_thread.h" | 9 #include "content/public/browser/browser_thread.h" | 
| 10 #include "net/base/net_errors.h" | 10 #include "net/base/net_errors.h" | 
| (...skipping 15 matching lines...) Expand all  Loading... | 
| 26     EXPECT_TRUE(mock_probe_running_); | 26     EXPECT_TRUE(mock_probe_running_); | 
| 27     OnDnsProbeFinished(status); | 27     OnDnsProbeFinished(status); | 
| 28     mock_probe_running_ = false; | 28     mock_probe_running_ = false; | 
| 29   } | 29   } | 
| 30 | 30 | 
| 31   bool mock_probe_running() const { return mock_probe_running_; } | 31   bool mock_probe_running() const { return mock_probe_running_; } | 
| 32   DnsProbeStatus last_status_sent() const { return last_status_sent_; } | 32   DnsProbeStatus last_status_sent() const { return last_status_sent_; } | 
| 33   int mock_sent_count() const { return mock_sent_count_; } | 33   int mock_sent_count() const { return mock_sent_count_; } | 
| 34 | 34 | 
| 35  private: | 35  private: | 
| 36   virtual void StartDnsProbe() OVERRIDE { | 36   virtual void StartDnsProbe() override { | 
| 37     EXPECT_FALSE(mock_probe_running_); | 37     EXPECT_FALSE(mock_probe_running_); | 
| 38     mock_probe_running_ = true; | 38     mock_probe_running_ = true; | 
| 39   } | 39   } | 
| 40 | 40 | 
| 41   virtual void SendInfo() OVERRIDE { | 41   virtual void SendInfo() override { | 
| 42     last_status_sent_ = dns_probe_status(); | 42     last_status_sent_ = dns_probe_status(); | 
| 43     mock_sent_count_++; | 43     mock_sent_count_++; | 
| 44   } | 44   } | 
| 45 | 45 | 
| 46   bool mock_probe_running_; | 46   bool mock_probe_running_; | 
| 47   DnsProbeStatus last_status_sent_; | 47   DnsProbeStatus last_status_sent_; | 
| 48   int mock_sent_count_; | 48   int mock_sent_count_; | 
| 49 }; | 49 }; | 
| 50 | 50 | 
| 51 class NetErrorTabHelperTest : public ChromeRenderViewHostTestHarness { | 51 class NetErrorTabHelperTest : public ChromeRenderViewHostTestHarness { | 
| 52  protected: | 52  protected: | 
| 53   enum MainFrame { SUB_FRAME, MAIN_FRAME }; | 53   enum MainFrame { SUB_FRAME, MAIN_FRAME }; | 
| 54   enum ErrorPage { NORMAL_PAGE, ERROR_PAGE }; | 54   enum ErrorPage { NORMAL_PAGE, ERROR_PAGE }; | 
| 55   enum ErrorType { DNS_ERROR, OTHER_ERROR }; | 55   enum ErrorType { DNS_ERROR, OTHER_ERROR }; | 
| 56 | 56 | 
| 57   virtual void SetUp() OVERRIDE { | 57   virtual void SetUp() override { | 
| 58     ChromeRenderViewHostTestHarness::SetUp(); | 58     ChromeRenderViewHostTestHarness::SetUp(); | 
| 59     subframe_ = content::RenderFrameHostTester::For(main_rfh()) | 59     subframe_ = content::RenderFrameHostTester::For(main_rfh()) | 
| 60                     ->AppendChild("subframe"); | 60                     ->AppendChild("subframe"); | 
| 61 | 61 | 
| 62     tab_helper_.reset(new TestNetErrorTabHelper); | 62     tab_helper_.reset(new TestNetErrorTabHelper); | 
| 63     NetErrorTabHelper::set_state_for_testing( | 63     NetErrorTabHelper::set_state_for_testing( | 
| 64         NetErrorTabHelper::TESTING_FORCE_ENABLED); | 64         NetErrorTabHelper::TESTING_FORCE_ENABLED); | 
| 65   } | 65   } | 
| 66 | 66 | 
| 67   void StartProvisionalLoad(MainFrame main_frame, ErrorPage error_page) { | 67   void StartProvisionalLoad(MainFrame main_frame, ErrorPage error_page) { | 
| (...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 373   CommitProvisionalLoad(MAIN_FRAME); | 373   CommitProvisionalLoad(MAIN_FRAME); | 
| 374   EXPECT_TRUE(probe_running()); | 374   EXPECT_TRUE(probe_running()); | 
| 375   EXPECT_EQ(3, sent_count()); | 375   EXPECT_EQ(3, sent_count()); | 
| 376   EXPECT_EQ(chrome_common_net::DNS_PROBE_STARTED, last_status_sent()); | 376   EXPECT_EQ(chrome_common_net::DNS_PROBE_STARTED, last_status_sent()); | 
| 377 | 377 | 
| 378   FinishProbe(chrome_common_net::DNS_PROBE_FINISHED_NXDOMAIN); | 378   FinishProbe(chrome_common_net::DNS_PROBE_FINISHED_NXDOMAIN); | 
| 379   EXPECT_FALSE(probe_running()); | 379   EXPECT_FALSE(probe_running()); | 
| 380   EXPECT_EQ(4, sent_count()); | 380   EXPECT_EQ(4, sent_count()); | 
| 381   EXPECT_EQ(chrome_common_net::DNS_PROBE_FINISHED_NXDOMAIN, last_status_sent()); | 381   EXPECT_EQ(chrome_common_net::DNS_PROBE_FINISHED_NXDOMAIN, last_status_sent()); | 
| 382 } | 382 } | 
| OLD | NEW | 
|---|