| 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 "chrome/browser/net/http_server_properties_manager.h" | 5 #include "chrome/browser/net/http_server_properties_manager.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "base/prefs/pref_registry_simple.h" | 9 #include "base/prefs/pref_registry_simple.h" |
| 10 #include "base/prefs/testing_pref_service.h" | 10 #include "base/prefs/testing_pref_service.h" |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 HttpServerPropertiesManager::StartCacheUpdateTimerOnUI( | 54 HttpServerPropertiesManager::StartCacheUpdateTimerOnUI( |
| 55 base::TimeDelta()); | 55 base::TimeDelta()); |
| 56 } | 56 } |
| 57 | 57 |
| 58 void UpdatePrefsFromCacheOnIOConcrete(const base::Closure& callback) { | 58 void UpdatePrefsFromCacheOnIOConcrete(const base::Closure& callback) { |
| 59 HttpServerPropertiesManager::UpdatePrefsFromCacheOnIO(callback); | 59 HttpServerPropertiesManager::UpdatePrefsFromCacheOnIO(callback); |
| 60 } | 60 } |
| 61 | 61 |
| 62 MOCK_METHOD0(UpdateCacheFromPrefsOnUI, void()); | 62 MOCK_METHOD0(UpdateCacheFromPrefsOnUI, void()); |
| 63 MOCK_METHOD1(UpdatePrefsFromCacheOnIO, void(const base::Closure&)); | 63 MOCK_METHOD1(UpdatePrefsFromCacheOnIO, void(const base::Closure&)); |
| 64 MOCK_METHOD5(UpdateCacheFromPrefsOnIO, | 64 MOCK_METHOD6(UpdateCacheFromPrefsOnIO, |
| 65 void(std::vector<std::string>* spdy_servers, | 65 void(std::vector<std::string>* spdy_servers, |
| 66 net::SpdySettingsMap* spdy_settings_map, | 66 net::SpdySettingsMap* spdy_settings_map, |
| 67 net::AlternateProtocolMap* alternate_protocol_map, | 67 net::AlternateProtocolMap* alternate_protocol_map, |
| 68 net::PipelineCapabilityMap* pipeline_capability_map, | 68 net::PipelineCapabilityMap* pipeline_capability_map, |
| 69 net::AlternateProtocolExperiment experiment, |
| 69 bool detected_corrupted_prefs)); | 70 bool detected_corrupted_prefs)); |
| 70 MOCK_METHOD4(UpdatePrefsOnUI, | 71 MOCK_METHOD4(UpdatePrefsOnUI, |
| 71 void(base::ListValue* spdy_server_list, | 72 void(base::ListValue* spdy_server_list, |
| 72 net::SpdySettingsMap* spdy_settings_map, | 73 net::SpdySettingsMap* spdy_settings_map, |
| 73 net::AlternateProtocolMap* alternate_protocol_map, | 74 net::AlternateProtocolMap* alternate_protocol_map, |
| 74 net::PipelineCapabilityMap* pipeline_capability_map)); | 75 net::PipelineCapabilityMap* pipeline_capability_map)); |
| 75 | 76 |
| 76 private: | 77 private: |
| 77 DISALLOW_COPY_AND_ASSIGN(TestingHttpServerPropertiesManager); | 78 DISALLOW_COPY_AND_ASSIGN(TestingHttpServerPropertiesManager); |
| 78 }; | 79 }; |
| (...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 528 // Run the task after shutdown, but before deletion. | 529 // Run the task after shutdown, but before deletion. |
| 529 loop_.RunUntilIdle(); | 530 loop_.RunUntilIdle(); |
| 530 Mock::VerifyAndClearExpectations(http_server_props_manager_.get()); | 531 Mock::VerifyAndClearExpectations(http_server_props_manager_.get()); |
| 531 http_server_props_manager_.reset(); | 532 http_server_props_manager_.reset(); |
| 532 loop_.RunUntilIdle(); | 533 loop_.RunUntilIdle(); |
| 533 } | 534 } |
| 534 | 535 |
| 535 } // namespace | 536 } // namespace |
| 536 | 537 |
| 537 } // namespace chrome_browser_net | 538 } // namespace chrome_browser_net |
| OLD | NEW |