| Index: ios/chrome/browser/ios_chrome_main_parts.mm
|
| diff --git a/ios/chrome/browser/ios_chrome_main_parts.mm b/ios/chrome/browser/ios_chrome_main_parts.mm
|
| index c75c83487dcfc79fb0064a83dedc795709109995..fab26e1310436dbde7dacd3bfdfaf9a2e75f6174 100644
|
| --- a/ios/chrome/browser/ios_chrome_main_parts.mm
|
| +++ b/ios/chrome/browser/ios_chrome_main_parts.mm
|
| @@ -8,6 +8,7 @@
|
| #include "base/feature_list.h"
|
| #include "base/files/file_path.h"
|
| #include "base/logging.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/path_service.h"
|
| #include "base/time/default_tick_clock.h"
|
| #include "components/content_settings/core/browser/cookie_settings.h"
|
| @@ -105,7 +106,7 @@ void IOSChromeMainParts::PreCreateThreads() {
|
|
|
| // Initialize tracking synchronizer system.
|
| tracking_synchronizer_ = new metrics::TrackingSynchronizer(
|
| - make_scoped_ptr(new base::DefaultTickClock()),
|
| + base::WrapUnique(new base::DefaultTickClock()),
|
| base::Bind(&metrics::IOSTrackingSynchronizerDelegate::Create));
|
|
|
| // Now the command line has been mutated based on about:flags, we can setup
|
| @@ -149,7 +150,7 @@ void IOSChromeMainParts::PreMainMessageLoopRun() {
|
| FirstRun::GetPingDelayPrefName());
|
| // Negative ping delay means to send ping immediately after a first search is
|
| // recorded.
|
| - rlz::RLZTracker::SetRlzDelegate(make_scoped_ptr(new RLZTrackerDelegateImpl));
|
| + rlz::RLZTracker::SetRlzDelegate(base::WrapUnique(new RLZTrackerDelegateImpl));
|
| rlz::RLZTracker::InitRlzDelayed(
|
| FirstRun::IsChromeFirstRun(), ping_delay < 0,
|
| base::TimeDelta::FromMilliseconds(abs(ping_delay)),
|
| @@ -221,7 +222,7 @@ void IOSChromeMainParts::SetUpMetricsAndFieldTrials() {
|
| CHECK(result) << "Invalid --" << switches::kIOSForceVariationIds
|
| << " list specified.";
|
| }
|
| - scoped_ptr<base::FeatureList> feature_list(new base::FeatureList);
|
| + std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
|
| feature_list->InitializeFromCommandLine(
|
| command_line->GetSwitchValueASCII(switches::kEnableIOSFeatures),
|
| command_line->GetSwitchValueASCII(switches::kDisableIOSFeatures));
|
|
|