OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "net/http/http_server_properties_manager.h" | 5 #include "net/http/http_server_properties_manager.h" |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/json/json_writer.h" | 8 #include "base/json/json_writer.h" |
9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
10 #include "base/prefs/pref_registry_simple.h" | 10 #include "base/prefs/pref_registry_simple.h" |
(...skipping 22 matching lines...) Expand all Loading... |
33 class TestingHttpServerPropertiesManager : public HttpServerPropertiesManager { | 33 class TestingHttpServerPropertiesManager : public HttpServerPropertiesManager { |
34 public: | 34 public: |
35 TestingHttpServerPropertiesManager( | 35 TestingHttpServerPropertiesManager( |
36 PrefService* pref_service, | 36 PrefService* pref_service, |
37 const char* pref_path, | 37 const char* pref_path, |
38 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner) | 38 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner) |
39 : HttpServerPropertiesManager(pref_service, pref_path, io_task_runner) { | 39 : HttpServerPropertiesManager(pref_service, pref_path, io_task_runner) { |
40 InitializeOnNetworkThread(); | 40 InitializeOnNetworkThread(); |
41 } | 41 } |
42 | 42 |
43 virtual ~TestingHttpServerPropertiesManager() {} | 43 ~TestingHttpServerPropertiesManager() override {} |
44 | 44 |
45 // Make these methods public for testing. | 45 // Make these methods public for testing. |
46 using HttpServerPropertiesManager::ScheduleUpdateCacheOnPrefThread; | 46 using HttpServerPropertiesManager::ScheduleUpdateCacheOnPrefThread; |
47 using HttpServerPropertiesManager::ScheduleUpdatePrefsOnNetworkThread; | 47 using HttpServerPropertiesManager::ScheduleUpdatePrefsOnNetworkThread; |
48 | 48 |
49 // Post tasks without a delay during tests. | 49 // Post tasks without a delay during tests. |
50 virtual void StartPrefsUpdateTimerOnNetworkThread( | 50 void StartPrefsUpdateTimerOnNetworkThread(base::TimeDelta delay) override { |
51 base::TimeDelta delay) override { | |
52 HttpServerPropertiesManager::StartPrefsUpdateTimerOnNetworkThread( | 51 HttpServerPropertiesManager::StartPrefsUpdateTimerOnNetworkThread( |
53 base::TimeDelta()); | 52 base::TimeDelta()); |
54 } | 53 } |
55 | 54 |
56 void UpdateCacheFromPrefsOnUIConcrete() { | 55 void UpdateCacheFromPrefsOnUIConcrete() { |
57 HttpServerPropertiesManager::UpdateCacheFromPrefsOnPrefThread(); | 56 HttpServerPropertiesManager::UpdateCacheFromPrefsOnPrefThread(); |
58 } | 57 } |
59 | 58 |
60 // Post tasks without a delay during tests. | 59 // Post tasks without a delay during tests. |
61 virtual void StartCacheUpdateTimerOnPrefThread( | 60 void StartCacheUpdateTimerOnPrefThread(base::TimeDelta delay) override { |
62 base::TimeDelta delay) override { | |
63 HttpServerPropertiesManager::StartCacheUpdateTimerOnPrefThread( | 61 HttpServerPropertiesManager::StartCacheUpdateTimerOnPrefThread( |
64 base::TimeDelta()); | 62 base::TimeDelta()); |
65 } | 63 } |
66 | 64 |
67 void UpdatePrefsFromCacheOnNetworkThreadConcrete( | 65 void UpdatePrefsFromCacheOnNetworkThreadConcrete( |
68 const base::Closure& callback) { | 66 const base::Closure& callback) { |
69 HttpServerPropertiesManager::UpdatePrefsFromCacheOnNetworkThread(callback); | 67 HttpServerPropertiesManager::UpdatePrefsFromCacheOnNetworkThread(callback); |
70 } | 68 } |
71 | 69 |
72 MOCK_METHOD0(UpdateCacheFromPrefsOnPrefThread, void()); | 70 MOCK_METHOD0(UpdateCacheFromPrefsOnPrefThread, void()); |
(...skipping 703 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
776 // Run the task after shutdown, but before deletion. | 774 // Run the task after shutdown, but before deletion. |
777 base::RunLoop().RunUntilIdle(); | 775 base::RunLoop().RunUntilIdle(); |
778 Mock::VerifyAndClearExpectations(http_server_props_manager_.get()); | 776 Mock::VerifyAndClearExpectations(http_server_props_manager_.get()); |
779 http_server_props_manager_.reset(); | 777 http_server_props_manager_.reset(); |
780 base::RunLoop().RunUntilIdle(); | 778 base::RunLoop().RunUntilIdle(); |
781 } | 779 } |
782 | 780 |
783 } // namespace | 781 } // namespace |
784 | 782 |
785 } // namespace net | 783 } // namespace net |
OLD | NEW |