Replace base::MakeUnique with std::make_unique in content/.
base/memory/ptr_util.h includes will be cleaned up later.
Generated by:
git grep -l base::MakeUnique content/ | xargs perl -pi -e 's/base::MakeUnique/std::make_unique/'
Bug: 755727
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_site_isolation
Change-Id: I10d622bde1d70b9a5f5aee0f229262c7018ec56b
Reviewed-on: https://chromium-review.googlesource.com/740181
Commit-Queue: Jeremy Roman <[email protected]>
Reviewed-by: Jeremy Roman <[email protected]>
Reviewed-by: Daniel Cheng <[email protected]>
Reviewed-by: Avi Drissman <[email protected]>
Reviewed-by: Kinuko Yasuda <[email protected]>
Cr-Commit-Position: refs/heads/master@{#512186}diff --git a/content/browser/web_contents/aura/gesture_nav_simple.cc b/content/browser/web_contents/aura/gesture_nav_simple.cc
index 2f2fd6c0..184563fc 100644
--- a/content/browser/web_contents/aura/gesture_nav_simple.cc
+++ b/content/browser/web_contents/aura/gesture_nav_simple.cc
@@ -326,7 +326,7 @@
state_ = State::ABORTING;
- animation_ = base::MakeUnique<gfx::LinearAnimation>(
+ animation_ = std::make_unique<gfx::LinearAnimation>(
GetAffordanceProgress() * kAbortAnimationDuration,
gfx::LinearAnimation::kDefaultFrameRate, this);
animation_->Start();
@@ -338,7 +338,7 @@
state_ = State::COMPLETING;
- animation_ = base::MakeUnique<gfx::LinearAnimation>(
+ animation_ = std::make_unique<gfx::LinearAnimation>(
kRippleBurstAnimationDuration, gfx::LinearAnimation::kDefaultFrameRate,
this);
animation_->Start();
@@ -646,7 +646,7 @@
DCHECK_LE(0, max_delta_);
aura::Window* window = web_contents_->GetNativeView();
- affordance_ = base::MakeUnique<Affordance>(
+ affordance_ = std::make_unique<Affordance>(
this, mode_, window->bounds(), max_delta_ / completion_threshold_);
// Adding the affordance as a child of the content window is not sufficient,
diff --git a/content/browser/web_contents/web_contents_android.cc b/content/browser/web_contents/web_contents_android.cc
index e9f632c..7a52b02 100644
--- a/content/browser/web_contents/web_contents_android.cc
+++ b/content/browser/web_contents/web_contents_android.cc
@@ -591,7 +591,7 @@
WebContentsViewAndroid* view =
static_cast<WebContentsViewAndroid*>(web_contents_->GetView());
view->SetOverscrollRefreshHandler(
- base::MakeUnique<ui::OverscrollRefreshHandler>(
+ std::make_unique<ui::OverscrollRefreshHandler>(
overscroll_refresh_handler));
}
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 6a4a330..8a788f6 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -1860,7 +1860,7 @@
void WebContentsImpl::AddDestructionObserver(WebContentsImpl* web_contents) {
if (!ContainsKey(destruction_observers_, web_contents)) {
destruction_observers_[web_contents] =
- base::MakeUnique<DestructionObserver>(this, web_contents);
+ std::make_unique<DestructionObserver>(this, web_contents);
}
}
@@ -3329,7 +3329,7 @@
"triggered by user request."
policy_exception_justification: "Not implemented."
})");
- auto params = base::MakeUnique<DownloadUrlParameters>(
+ auto params = std::make_unique<DownloadUrlParameters>(
url, frame_host->GetProcess()->GetID(),
frame_host->GetRenderViewHost()->GetRoutingID(),
frame_host->GetRoutingID(), storage_partition->GetURLRequestContext(),
@@ -5714,12 +5714,12 @@
}
std::unique_ptr<WebUIImpl> WebContentsImpl::CreateWebUI(const GURL& url) {
- std::unique_ptr<WebUIImpl> web_ui = base::MakeUnique<WebUIImpl>(this);
+ std::unique_ptr<WebUIImpl> web_ui = std::make_unique<WebUIImpl>(this);
WebUIController* controller =
WebUIControllerFactoryRegistry::GetInstance()
->CreateWebUIControllerForURL(web_ui.get(), url);
if (controller) {
- web_ui->AddMessageHandler(base::MakeUnique<GenericHandler>());
+ web_ui->AddMessageHandler(std::make_unique<GenericHandler>());
web_ui->SetController(controller);
return web_ui;
}
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
index d800224..af9d1c4 100644
--- a/content/browser/web_contents/web_contents_view_aura.cc
+++ b/content/browser/web_contents/web_contents_view_aura.cc
@@ -805,7 +805,7 @@
// value is set shortly after this, so its safe to ignore.
DCHECK(aura::Env::GetInstanceDontCreate());
- window_ = base::MakeUnique<aura::Window>(this);
+ window_ = std::make_unique<aura::Window>(this);
window_->set_owned_by_parent(false);
window_->SetType(aura::client::WINDOW_TYPE_CONTROL);
window_->SetName("WebContentsViewAura");
