OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "components/subresource_filter/core/browser/ruleset_service.h" | 5 #include "components/subresource_filter/core/browser/ruleset_service.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <memory> | 10 #include <memory> |
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
144 ASSERT_NO_FATAL_FAILURE( | 144 ASSERT_NO_FATAL_FAILURE( |
145 ruleset_creator_.CreateRulesetToDisallowURLsWithPathSuffix( | 145 ruleset_creator_.CreateRulesetToDisallowURLsWithPathSuffix( |
146 kTestDisallowedSuffix2, &test_ruleset_2_)); | 146 kTestDisallowedSuffix2, &test_ruleset_2_)); |
147 } | 147 } |
148 | 148 |
149 virtual void SetUpTempDir() { | 149 virtual void SetUpTempDir() { |
150 ASSERT_TRUE(scoped_temp_dir_.CreateUniqueTempDir()); | 150 ASSERT_TRUE(scoped_temp_dir_.CreateUniqueTempDir()); |
151 } | 151 } |
152 | 152 |
153 std::unique_ptr<RulesetService> CreateRulesetService() { | 153 std::unique_ptr<RulesetService> CreateRulesetService() { |
154 return base::WrapUnique( | 154 return base::MakeUnique<RulesetService>(&pref_service_, task_runner_, |
155 new RulesetService(&pref_service_, task_runner_, base_dir())); | 155 base_dir()); |
156 } | 156 } |
157 | 157 |
158 void ResetService(std::unique_ptr<RulesetService> new_service = nullptr) { | 158 void ResetService(std::unique_ptr<RulesetService> new_service = nullptr) { |
159 service_ = std::move(new_service); | 159 service_ = std::move(new_service); |
160 if (service_) { | 160 if (service_) { |
161 service_->RegisterDistributor( | 161 service_->RegisterDistributor( |
162 base::WrapUnique(mock_distributor_ = new MockRulesetDistributor())); | 162 base::WrapUnique(mock_distributor_ = new MockRulesetDistributor())); |
163 } else { | 163 } else { |
164 mock_distributor_ = nullptr; | 164 mock_distributor_ = nullptr; |
165 } | 165 } |
(...skipping 679 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
845 AssertReadonlyRulesetFile(&mock_distributor()->published_rulesets()[0])); | 845 AssertReadonlyRulesetFile(&mock_distributor()->published_rulesets()[0])); |
846 | 846 |
847 MockRulesetDistributor* new_distributor = new MockRulesetDistributor; | 847 MockRulesetDistributor* new_distributor = new MockRulesetDistributor; |
848 service()->RegisterDistributor(base::WrapUnique(new_distributor)); | 848 service()->RegisterDistributor(base::WrapUnique(new_distributor)); |
849 ASSERT_EQ(1u, new_distributor->published_rulesets().size()); | 849 ASSERT_EQ(1u, new_distributor->published_rulesets().size()); |
850 ASSERT_NO_FATAL_FAILURE( | 850 ASSERT_NO_FATAL_FAILURE( |
851 AssertReadonlyRulesetFile(&new_distributor->published_rulesets()[0])); | 851 AssertReadonlyRulesetFile(&new_distributor->published_rulesets()[0])); |
852 } | 852 } |
853 | 853 |
854 } // namespace subresource_filter | 854 } // namespace subresource_filter |
OLD | NEW |