diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-14 17:41:05 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:37:36 +0000 |
| commit | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (patch) | |
| tree | 6b06b60ff365abef0e13b3503d593a0df48d20e8 /chromium/components/search/search_unittest.cc | |
| parent | 7366110654eec46f21b6824f302356426f48cd74 (diff) | |
| download | qtwebengine-chromium-399c965b6064c440ddcf4015f5f8e9d131c7a0a6.tar.gz | |
BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1
Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/components/search/search_unittest.cc')
| -rw-r--r-- | chromium/components/search/search_unittest.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chromium/components/search/search_unittest.cc b/chromium/components/search/search_unittest.cc index e8cf6c090d0..622ecd54c00 100644 --- a/chromium/components/search/search_unittest.cc +++ b/chromium/components/search/search_unittest.cc @@ -4,7 +4,8 @@ #include "components/search/search.h" -#include "base/memory/scoped_ptr.h" +#include <memory> + #include "base/metrics/field_trial.h" #include "base/metrics/statistics_recorder.h" #include "build/build_config.h" @@ -22,7 +23,7 @@ class EmbeddedSearchFieldTrialTest : public testing::Test { } private: - scoped_ptr<base::FieldTrialList> field_trial_list_; + std::unique_ptr<base::FieldTrialList> field_trial_list_; }; TEST_F(EmbeddedSearchFieldTrialTest, GetFieldTrialInfoEmptyAndValid) { |