| 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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 }; | 94 }; |
| 95 | 95 |
| 96 class HttpServerPropertiesManagerTest : public testing::Test { | 96 class HttpServerPropertiesManagerTest : public testing::Test { |
| 97 protected: | 97 protected: |
| 98 HttpServerPropertiesManagerTest() {} | 98 HttpServerPropertiesManagerTest() {} |
| 99 | 99 |
| 100 void SetUp() override { | 100 void SetUp() override { |
| 101 pref_service_.registry()->RegisterDictionaryPref(kTestHttpServerProperties); | 101 pref_service_.registry()->RegisterDictionaryPref(kTestHttpServerProperties); |
| 102 http_server_props_manager_.reset( | 102 http_server_props_manager_.reset( |
| 103 new StrictMock<TestingHttpServerPropertiesManager>( | 103 new StrictMock<TestingHttpServerPropertiesManager>( |
| 104 &pref_service_, | 104 &pref_service_, kTestHttpServerProperties, |
| 105 kTestHttpServerProperties, | 105 base::MessageLoop::current()->task_runner())); |
| 106 base::MessageLoop::current()->message_loop_proxy())); | |
| 107 ExpectCacheUpdate(); | 106 ExpectCacheUpdate(); |
| 108 base::RunLoop().RunUntilIdle(); | 107 base::RunLoop().RunUntilIdle(); |
| 109 } | 108 } |
| 110 | 109 |
| 111 void TearDown() override { | 110 void TearDown() override { |
| 112 if (http_server_props_manager_.get()) | 111 if (http_server_props_manager_.get()) |
| 113 http_server_props_manager_->ShutdownOnPrefThread(); | 112 http_server_props_manager_->ShutdownOnPrefThread(); |
| 114 base::RunLoop().RunUntilIdle(); | 113 base::RunLoop().RunUntilIdle(); |
| 115 http_server_props_manager_.reset(); | 114 http_server_props_manager_.reset(); |
| 116 } | 115 } |
| (...skipping 663 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 780 // Run the task after shutdown, but before deletion. | 779 // Run the task after shutdown, but before deletion. |
| 781 base::RunLoop().RunUntilIdle(); | 780 base::RunLoop().RunUntilIdle(); |
| 782 Mock::VerifyAndClearExpectations(http_server_props_manager_.get()); | 781 Mock::VerifyAndClearExpectations(http_server_props_manager_.get()); |
| 783 http_server_props_manager_.reset(); | 782 http_server_props_manager_.reset(); |
| 784 base::RunLoop().RunUntilIdle(); | 783 base::RunLoop().RunUntilIdle(); |
| 785 } | 784 } |
| 786 | 785 |
| 787 } // namespace | 786 } // namespace |
| 788 | 787 |
| 789 } // namespace net | 788 } // namespace net |
| OLD | NEW |