| OLD | NEW |
| 1 // Copyright (c) 2011 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.h" | 8 #include "base/message_loop.h" |
| 9 #include "base/values.h" | 9 #include "base/values.h" |
| 10 #include "chrome/common/pref_names.h" | 10 #include "chrome/common/pref_names.h" |
| 11 #include "chrome/test/base/testing_pref_service.h" | 11 #include "chrome/test/base/testing_pref_service.h" |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 HttpServerPropertiesManager::StartCacheUpdateTimerOnUI( | 53 HttpServerPropertiesManager::StartCacheUpdateTimerOnUI( |
| 54 base::TimeDelta()); | 54 base::TimeDelta()); |
| 55 } | 55 } |
| 56 | 56 |
| 57 void UpdatePrefsFromCacheOnIOConcrete() { | 57 void UpdatePrefsFromCacheOnIOConcrete() { |
| 58 HttpServerPropertiesManager::UpdatePrefsFromCacheOnIO(); | 58 HttpServerPropertiesManager::UpdatePrefsFromCacheOnIO(); |
| 59 } | 59 } |
| 60 | 60 |
| 61 MOCK_METHOD0(UpdateCacheFromPrefsOnUI, void()); | 61 MOCK_METHOD0(UpdateCacheFromPrefsOnUI, void()); |
| 62 MOCK_METHOD0(UpdatePrefsFromCacheOnIO, void()); | 62 MOCK_METHOD0(UpdatePrefsFromCacheOnIO, void()); |
| 63 MOCK_METHOD4(UpdateCacheFromPrefsOnIO, | 63 MOCK_METHOD5(UpdateCacheFromPrefsOnIO, |
| 64 void(std::vector<std::string>* spdy_servers, | 64 void(std::vector<std::string>* spdy_servers, |
| 65 net::SpdySettingsMap* spdy_settings_map, | 65 net::SpdySettingsMap* spdy_settings_map, |
| 66 net::AlternateProtocolMap* alternate_protocol_map, | 66 net::AlternateProtocolMap* alternate_protocol_map, |
| 67 net::PipelineCapabilityMap* pipeline_capability_map)); | 67 net::PipelineCapabilityMap* pipeline_capability_map, |
| 68 bool detected_corrupted_prefs)); |
| 68 MOCK_METHOD4(UpdatePrefsOnUI, | 69 MOCK_METHOD4(UpdatePrefsOnUI, |
| 69 void(base::ListValue* spdy_server_list, | 70 void(base::ListValue* spdy_server_list, |
| 70 net::SpdySettingsMap* spdy_settings_map, | 71 net::SpdySettingsMap* spdy_settings_map, |
| 71 net::AlternateProtocolMap* alternate_protocol_map, | 72 net::AlternateProtocolMap* alternate_protocol_map, |
| 72 net::PipelineCapabilityMap* pipeline_capability_map)); | 73 net::PipelineCapabilityMap* pipeline_capability_map)); |
| 73 | 74 |
| 74 private: | 75 private: |
| 75 DISALLOW_COPY_AND_ASSIGN(TestingHttpServerPropertiesManager); | 76 DISALLOW_COPY_AND_ASSIGN(TestingHttpServerPropertiesManager); |
| 76 }; | 77 }; |
| 77 | 78 |
| (...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 477 // Run the task after shutdown, but before deletion. | 478 // Run the task after shutdown, but before deletion. |
| 478 loop_.RunAllPending(); | 479 loop_.RunAllPending(); |
| 479 Mock::VerifyAndClearExpectations(http_server_props_manager_.get()); | 480 Mock::VerifyAndClearExpectations(http_server_props_manager_.get()); |
| 480 http_server_props_manager_.reset(); | 481 http_server_props_manager_.reset(); |
| 481 loop_.RunAllPending(); | 482 loop_.RunAllPending(); |
| 482 } | 483 } |
| 483 | 484 |
| 484 } // namespace | 485 } // namespace |
| 485 | 486 |
| 486 } // namespace chrome_browser_net | 487 } // namespace chrome_browser_net |
| OLD | NEW |