| Index: components/variations/variations_seed_processor_unittest.cc
|
| diff --git a/components/variations/variations_seed_processor_unittest.cc b/components/variations/variations_seed_processor_unittest.cc
|
| index cac84dc64a37baa9f4a9ae5f92a6e0fa1ea5c265..5c54df657f0cb056a382e7cb3ca6fbb95d8b2486 100644
|
| --- a/components/variations/variations_seed_processor_unittest.cc
|
| +++ b/components/variations/variations_seed_processor_unittest.cc
|
| @@ -6,7 +6,9 @@
|
|
|
| #include <stddef.h>
|
| #include <stdint.h>
|
| +
|
| #include <map>
|
| +#include <memory>
|
| #include <utility>
|
| #include <vector>
|
|
|
| @@ -15,7 +17,6 @@
|
| #include "base/feature_list.h"
|
| #include "base/format_macros.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/strings/string_split.h"
|
| #include "base/strings/stringprintf.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| @@ -586,7 +587,7 @@ TEST_F(VariationsSeedProcessorTest, FeatureEnabledOrDisableByTrial) {
|
|
|
| base::FieldTrialList field_trial_list(NULL);
|
| base::FeatureList::ClearInstanceForTesting();
|
| - scoped_ptr<base::FeatureList> feature_list(new base::FeatureList);
|
| + std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
|
|
|
| Study study;
|
| study.set_name("Study1");
|
| @@ -710,7 +711,7 @@ TEST_F(VariationsSeedProcessorTest, FeatureAssociationAndForcing) {
|
|
|
| base::FieldTrialList field_trial_list(NULL);
|
| base::FeatureList::ClearInstanceForTesting();
|
| - scoped_ptr<base::FeatureList> feature_list(new base::FeatureList);
|
| + std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
|
| feature_list->InitializeFromCommandLine(
|
| test_case.enable_features_command_line,
|
| test_case.disable_features_command_line);
|
|
|