Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(459)

Side by Side Diff: components/variations/variations_params_manager.cc

Issue 2598963005: Include-what-you-use for WrapUnique/MakeUnique. (Closed)
Patch Set: restore order of includes in x11_topmost_window_finder_interactive_uitest.cc Created 3 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/variations/variations_params_manager.h" 5 #include "components/variations/variations_params_manager.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/feature_list.h" 9 #include "base/feature_list.h"
10 #include "base/memory/ptr_util.h"
10 #include "base/metrics/field_trial.h" 11 #include "base/metrics/field_trial.h"
11 #include "base/test/scoped_feature_list.h" 12 #include "base/test/scoped_feature_list.h"
12 #include "components/variations/variations_associated_data.h" 13 #include "components/variations/variations_associated_data.h"
13 14
14 namespace variations { 15 namespace variations {
15 namespace testing { 16 namespace testing {
16 17
17 namespace { 18 namespace {
18 19
19 // The fixed testing group created in the provided trail when setting up params. 20 // The fixed testing group created in the provided trail when setting up params.
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 // When the scoped feature list is destroyed, it puts back the original 87 // When the scoped feature list is destroyed, it puts back the original
87 // feature list that was there when InitWithFeatureList() was called. 88 // feature list that was there when InitWithFeatureList() was called.
88 scoped_feature_list_.reset(new base::test::ScopedFeatureList()); 89 scoped_feature_list_.reset(new base::test::ScopedFeatureList());
89 // Ensure the destructor is called properly, so it can be freshly recreated. 90 // Ensure the destructor is called properly, so it can be freshly recreated.
90 field_trial_list_.reset(); 91 field_trial_list_.reset();
91 field_trial_list_ = base::MakeUnique<base::FieldTrialList>(nullptr); 92 field_trial_list_ = base::MakeUnique<base::FieldTrialList>(nullptr);
92 } 93 }
93 94
94 } // namespace testing 95 } // namespace testing
95 } // namespace variations 96 } // namespace variations
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698