Chromium Code Reviews| Index: components/network_time/network_time_test_utils.cc |
| diff --git a/components/network_time/network_time_test_utils.cc b/components/network_time/network_time_test_utils.cc |
| index b8203a4e2968bbab100ee1cd359909dc5f4a6be7..441ecba0269fe22ddea5a7b034238afe10cd5145 100644 |
| --- a/components/network_time/network_time_test_utils.cc |
| +++ b/components/network_time/network_time_test_utils.cc |
| @@ -49,19 +49,9 @@ std::unique_ptr<net::test_server::HttpResponse> GoodTimeResponseHandler( |
| return std::unique_ptr<net::test_server::HttpResponse>(response); |
| } |
| -FieldTrialTest::~FieldTrialTest() {} |
| - |
| -FieldTrialTest* FieldTrialTest::CreateForUnitTest() { |
| - FieldTrialTest* test = new FieldTrialTest(); |
| - test->create_field_trial_list_ = true; |
| - return test; |
| -} |
| +FieldTrialTest::FieldTrialTest() {} |
| -FieldTrialTest* FieldTrialTest::CreateForBrowserTest() { |
| - FieldTrialTest* test = new FieldTrialTest(); |
| - test->create_field_trial_list_ = false; |
| - return test; |
| -} |
| +FieldTrialTest::~FieldTrialTest() {} |
| void FieldTrialTest::SetNetworkQueriesWithVariationsService( |
| bool enable, |
| @@ -105,11 +95,10 @@ void FieldTrialTest::SetNetworkQueriesWithVariationsService( |
| // ScopedFeatureList helper class. If this comment was useful to you |
| // please send me a postcard. |
| - if (create_field_trial_list_) { |
| - field_trial_list_.reset(); // Averts a CHECK fail in constructor below. |
| - field_trial_list_.reset(new base::FieldTrialList( |
| - base::MakeUnique<base::MockEntropyProvider>())); |
| - } |
| + field_trial_list_.reset(); // Averts a CHECK fail in constructor below. |
|
meacer
2017/01/23 21:35:54
nit: Is this still needed?
estark
2017/01/23 23:42:38
Err. Probably. I'll try removing it and see if the
|
| + field_trial_list_.reset( |
| + new base::FieldTrialList(base::MakeUnique<base::MockEntropyProvider>())); |
| + |
| // refcounted, and reference held by the singleton FieldTrialList. |
| base::FieldTrial* trial = base::FieldTrialList::FactoryGetFieldTrial( |
| kTrialName, 100, kGroupName, 1971, 1, 1, |
| @@ -126,6 +115,4 @@ void FieldTrialTest::SetNetworkQueriesWithVariationsService( |
| scoped_feature_list_->InitWithFeatureList(std::move(feature_list)); |
| } |
| -FieldTrialTest::FieldTrialTest() {} |
| - |
| } // namespace network_time |