extensions: Replace base::MakeUnique with std::make_unique
Should use std::make_unique directly instead of using base::MakeUnique
since August[1]. So, this change removes usages of base::MakeUnique in
//chrome/browser/extensions.
This change removes `#include "base/memory/ptr_util.h"` if it's no more
used in files. (Might not remove if base::WrapUnique is used)
This change also adds `#include <memory>` header except the following
two cases:
- Not add the header if the file contains the <memory> header
- Not add the header if the related header contains <memory> header
(The style guide[2] says that foo.cc can rely on foo.h's includes)
Confirmed no additional lint errors(by `git cl lint`) after this change.
[1] https://chromium-review.googlesource.com/c/chromium/src/+/616016
[2] https://google.github.io/styleguide/cppguide.html#Names_and_Order_of_Includes
Bug: 755727
Change-Id: Iad81c59fef2a7b92eb6d27fb891bc8c19643d32d
Reviewed-on: https://chromium-review.googlesource.com/867171
Reviewed-by: Devlin <[email protected]>
Commit-Queue: Jinho Bang <[email protected]>
Cr-Commit-Position: refs/heads/master@{#529852}diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc
index 35f4c7a..75e8419 100644
--- a/chrome/browser/extensions/extension_tab_util.cc
+++ b/chrome/browser/extensions/extension_tab_util.cc
@@ -374,17 +374,17 @@
if (!tab_strip)
ExtensionTabUtil::GetTabStripModel(contents, &tab_strip, &tab_index);
bool is_loading = contents->IsLoading();
- auto tab_object = base::MakeUnique<api::tabs::Tab>();
- tab_object->id = base::MakeUnique<int>(GetTabIdForExtensions(contents));
+ auto tab_object = std::make_unique<api::tabs::Tab>();
+ tab_object->id = std::make_unique<int>(GetTabIdForExtensions(contents));
tab_object->index = tab_index;
tab_object->window_id = GetWindowIdOfTab(contents);
tab_object->status =
- base::MakeUnique<std::string>(GetTabStatusText(is_loading));
+ std::make_unique<std::string>(GetTabStatusText(is_loading));
tab_object->active = tab_strip && tab_index == tab_strip->active_index();
tab_object->selected = tab_strip && tab_index == tab_strip->active_index();
tab_object->highlighted = tab_strip && tab_strip->IsTabSelected(tab_index);
tab_object->pinned = tab_strip && tab_strip->IsTabPinned(tab_index);
- tab_object->audible = base::MakeUnique<bool>(contents->WasRecentlyAudible());
+ tab_object->audible = std::make_unique<bool>(contents->WasRecentlyAudible());
tab_object->discarded =
g_browser_process->GetTabManager()->IsTabDiscarded(contents);
tab_object->auto_discardable =
@@ -392,22 +392,22 @@
tab_object->muted_info = CreateMutedInfo(contents);
tab_object->incognito = contents->GetBrowserContext()->IsOffTheRecord();
gfx::Size contents_size = contents->GetContainerBounds().size();
- tab_object->width = base::MakeUnique<int>(contents_size.width());
- tab_object->height = base::MakeUnique<int>(contents_size.height());
+ tab_object->width = std::make_unique<int>(contents_size.width());
+ tab_object->height = std::make_unique<int>(contents_size.height());
- tab_object->url = base::MakeUnique<std::string>(contents->GetURL().spec());
+ tab_object->url = std::make_unique<std::string>(contents->GetURL().spec());
tab_object->title =
- base::MakeUnique<std::string>(base::UTF16ToUTF8(contents->GetTitle()));
+ std::make_unique<std::string>(base::UTF16ToUTF8(contents->GetTitle()));
NavigationEntry* entry = contents->GetController().GetVisibleEntry();
if (entry && entry->GetFavicon().valid) {
tab_object->fav_icon_url =
- base::MakeUnique<std::string>(entry->GetFavicon().url.spec());
+ std::make_unique<std::string>(entry->GetFavicon().url.spec());
}
if (tab_strip) {
WebContents* opener = tab_strip->GetOpenerOfWebContentsAt(tab_index);
if (opener) {
tab_object->opener_tab_id =
- base::MakeUnique<int>(GetTabIdForExtensions(opener));
+ std::make_unique<int>(GetTabIdForExtensions(opener));
}
}
