Merge pull request #12601 from electron/makeunique-replace

Replace base::MakeUnique with std::make_unique

atom/browser/api/atom_api_session.cc

@@ -602,7 +602,7 @@ void Session::EnableNetworkEmulation(const mate::Dictionary& options) {
 }
 
 void Session::DisableNetworkEmulation() {
-  auto conditions = base::MakeUnique<content::DevToolsNetworkConditions>();
+  auto conditions = std::make_unique<content::DevToolsNetworkConditions>();
   content::DevToolsNetworkController::SetNetworkState(
       devtools_network_emulation_client_id_, std::move(conditions));
   BrowserThread::PostTask(

atom/browser/api/trackable_object.cc

@@ -6,7 +6,6 @@
 
 #include "atom/browser/atom_browser_main_parts.h"
 #include "base/bind.h"
-#include "base/memory/ptr_util.h"
 #include "base/supports_user_data.h"
 
 namespace mate {
@@ -49,7 +48,7 @@ void TrackableObjectBase::Destroy() {
 
 void TrackableObjectBase::AttachAsUserData(base::SupportsUserData* wrapped) {
   wrapped->SetUserData(kTrackedObjectKey,
-      base::MakeUnique<IDUserData>(weak_map_id_));
+      std::make_unique<IDUserData>(weak_map_id_));
 }
 
 // static

atom/browser/atom_browser_context.cc

@@ -111,7 +111,7 @@ AtomBrowserContext::RegisterCookieChangeCallback(
 
 std::unique_ptr<net::NetworkDelegate>
 AtomBrowserContext::CreateNetworkDelegate() {
-  return base::MakeUnique<AtomNetworkDelegate>();
+  return std::make_unique<AtomNetworkDelegate>();
 }
 
 std::string AtomBrowserContext::GetUserAgent() {

atom/browser/atom_permission_manager.cc

@@ -162,7 +162,7 @@ int AtomPermissionManager::RequestPermissionsWithDetails(
 
   auto web_contents =
       content::WebContents::FromRenderFrameHost(render_frame_host);
-  int request_id = pending_requests_.Add(base::MakeUnique<PendingRequest>(
+  int request_id = pending_requests_.Add(std::make_unique<PendingRequest>(
       render_frame_host, permissions, response_callback));
 
   for (size_t i = 0; i < permissions.size(); ++i) {

atom/browser/common_web_contents_delegate.cc

@@ -15,7 +15,6 @@
 #include "atom/browser/web_dialog_helper.h"
 #include "atom/common/atom_constants.h"
 #include "base/files/file_util.h"
-#include "base/memory/ptr_util.h"
 #include "chrome/browser/printing/print_preview_message_handler.h"
 #include "chrome/browser/printing/print_view_manager_basic.h"
 #include "chrome/browser/ssl/security_state_tab_helper.h"
@@ -186,7 +185,7 @@ void CommonWebContentsDelegate::SetOwnerWindow(NativeWindow* owner_window) {
 void CommonWebContentsDelegate::SetOwnerWindow(
     content::WebContents* web_contents, NativeWindow* owner_window) {
   owner_window_ = owner_window ? owner_window->GetWeakPtr() : nullptr;
-  auto relay = base::MakeUnique<NativeWindowRelay>(owner_window_);
+  auto relay = std::make_unique<NativeWindowRelay>(owner_window_);
   auto relay_key = relay->key;
   if (owner_window) {
 #if defined(TOOLKIT_VIEWS)
@@ -397,7 +396,7 @@ void CommonWebContentsDelegate::DevToolsAddFileSystem(
   auto pref_service = GetPrefService(GetDevToolsWebContents());
   DictionaryPrefUpdate update(pref_service, prefs::kDevToolsFileSystemPaths);
   update.Get()->SetWithoutPathExpansion(
-      path.AsUTF8Unsafe(), base::MakeUnique<base::Value>());
+      path.AsUTF8Unsafe(), std::make_unique<base::Value>());
 
   web_contents_->CallClientFunction("DevToolsAPI.fileSystemAdded",
                                     file_system_value.get(),

atom/browser/mac/dict_util.mm

@@ -5,7 +5,6 @@
 #include "atom/browser/mac/dict_util.h"
 
 #include "base/json/json_writer.h"
-#include "base/memory/ptr_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/values.h"
 
@@ -46,14 +45,14 @@ std::unique_ptr<base::ListValue> NSArrayToListValue(NSArray* arr) {
       if (sub_arr)
         result->Append(std::move(sub_arr));
       else
-        result->Append(base::MakeUnique<base::Value>());
+        result->Append(std::make_unique<base::Value>());
     } else if ([value isKindOfClass:[NSDictionary class]]) {
       std::unique_ptr<base::DictionaryValue> sub_dict =
           NSDictionaryToDictionaryValue(value);
       if (sub_dict)
         result->Append(std::move(sub_dict));
       else
-        result->Append(base::MakeUnique<base::Value>());
+        result->Append(std::make_unique<base::Value>());
     } else {
       result->AppendString(base::SysNSStringToUTF8([value description]));
     }
@@ -104,7 +103,7 @@ std::unique_ptr<base::DictionaryValue> NSDictionaryToDictionaryValue(
         result->SetWithoutPathExpansion(str_key, std::move(sub_arr));
       else
         result->SetWithoutPathExpansion(str_key,
-                                        base::MakeUnique<base::Value>());
+                                        std::make_unique<base::Value>());
     } else if ([value isKindOfClass:[NSDictionary class]]) {
       std::unique_ptr<base::DictionaryValue> sub_dict =
           NSDictionaryToDictionaryValue(value);
@@ -112,7 +111,7 @@ std::unique_ptr<base::DictionaryValue> NSDictionaryToDictionaryValue(
         result->SetWithoutPathExpansion(str_key, std::move(sub_dict));
       else
         result->SetWithoutPathExpansion(str_key,
-                                        base::MakeUnique<base::Value>());
+                                        std::make_unique<base::Value>());
     } else {
       result->SetKey(str_key,
                      base::Value(base::SysNSStringToUTF8([value description])));

atom/browser/net/atom_cert_verifier.cc

@@ -7,7 +7,6 @@
 #include "atom/browser/browser.h"
 #include "atom/common/native_mate_converters/net_converter.h"
 #include "base/containers/linked_list.h"
-#include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "brightray/browser/net/require_ct_delegate.h"
 #include "content/public/browser/browser_thread.h"
@@ -177,7 +176,7 @@ int AtomCertVerifier::Verify(
     if (!request) {
       out_req->reset();
       std::unique_ptr<CertVerifierRequest> new_request =
-          base::MakeUnique<CertVerifierRequest>(params, this);
+          std::make_unique<CertVerifierRequest>(params, this);
       new_request->Start(crl_set, net_log);
       request = new_request.get();
       *out_req = std::move(new_request);

atom/browser/osr/osr_render_widget_host_view.cc

@@ -290,7 +290,7 @@ OffScreenRenderWidgetHostView::OffScreenRenderWidgetHostView(
   DCHECK(render_widget_host_);
   bool is_guest_view_hack = parent_host_view_ != nullptr;
 #if !defined(OS_MACOSX)
-  delegated_frame_host_ = base::MakeUnique<content::DelegatedFrameHost>(
+  delegated_frame_host_ = std::make_unique<content::DelegatedFrameHost>(
       AllocateFrameSinkId(is_guest_view_hack), this,
       false /* enable_surface_synchronization */);
 
@@ -788,7 +788,7 @@ std::unique_ptr<content::CompositorResizeLock>
 OffScreenRenderWidgetHostView::DelegatedFrameHostCreateResizeLock() {
   HoldResize();
   const gfx::Size& desired_size = GetRootLayer()->bounds().size();
-  return base::MakeUnique<content::CompositorResizeLock>(this, desired_size);
+  return std::make_unique<content::CompositorResizeLock>(this, desired_size);
 }
 
 viz::LocalSurfaceId OffScreenRenderWidgetHostView::GetLocalSurfaceId() const {
@@ -897,7 +897,7 @@ void OffScreenRenderWidgetHostView::ProxyViewDestroyed(
 
 void OffScreenRenderWidgetHostView::RegisterGuestViewFrameSwappedCallback(
     content::RenderWidgetHostViewGuest* guest_host_view) {
-  guest_host_view->RegisterFrameSwappedCallback(base::MakeUnique<base::Closure>(
+  guest_host_view->RegisterFrameSwappedCallback(std::make_unique<base::Closure>(
     base::Bind(&OffScreenRenderWidgetHostView::OnGuestViewFrameSwapped,
                weak_ptr_factory_.GetWeakPtr(),
                base::Unretained(guest_host_view))));

atom/browser/ui/webui/pdf_viewer_handler.cc

@@ -6,7 +6,6 @@
 
 #include "atom/common/atom_constants.h"
 #include "base/bind.h"
-#include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "content/public/browser/stream_handle.h"
@@ -45,7 +44,7 @@ void CreateResponseHeadersDictionary(const net::HttpResponseHeaders* headers,
 void PopulateStreamInfo(base::DictionaryValue* stream_info,
                         content::StreamInfo* stream,
                         const std::string& original_url) {
-  auto headers_dict = base::MakeUnique<base::DictionaryValue>();
+  auto headers_dict = std::make_unique<base::DictionaryValue>();
   auto stream_url = stream->handle->GetURL().spec();
   CreateResponseHeadersDictionary(stream->response_headers.get(),
                                   headers_dict.get());
@@ -66,7 +65,7 @@ PdfViewerHandler::~PdfViewerHandler() {
 void PdfViewerHandler::SetPdfResourceStream(content::StreamInfo* stream) {
   stream_ = stream;
   if (!!initialize_callback_id_.get()) {
-    auto list = base::MakeUnique<base::ListValue>();
+    auto list = std::make_unique<base::ListValue>();
     list->Set(0, std::move(initialize_callback_id_));
     Initialize(list.get());
   }
@@ -109,7 +108,7 @@ void PdfViewerHandler::Initialize(const base::ListValue* args) {
     CHECK(!initialize_callback_id_.get());
     AllowJavascript();
 
-    auto stream_info = base::MakeUnique<base::DictionaryValue>();
+    auto stream_info = std::make_unique<base::DictionaryValue>();
     PopulateStreamInfo(stream_info.get(), stream_, original_url_);
     ResolveJavascriptCallback(*callback_id, *stream_info);
   } else {
@@ -174,7 +173,7 @@ void PdfViewerHandler::GetStrings(const base::ListValue* args) {
   const base::Value* callback_id;
   CHECK(args->Get(0, &callback_id));
 
-  auto result = base::MakeUnique<base::DictionaryValue>();
+  auto result = std::make_unique<base::DictionaryValue>();
 // TODO(deepak1556): Generate strings from components/pdf_strings.grdp.
 #define SET_STRING(id, resource) result->SetString(id, resource)
   SET_STRING("passwordPrompt",

atom/browser/ui/webui/pdf_viewer_ui.cc

@@ -145,7 +145,7 @@ class PdfViewerUI::ResourceRequester
         content::GetStreamContextForResourceContext(resource_context);
 
     std::unique_ptr<content::ResourceHandler> handler =
-        base::MakeUnique<content::StreamResourceHandler>(
+        std::make_unique<content::StreamResourceHandler>(
             request.get(), stream_context->registry(), origin, false);
     info->set_is_stream(true);
     stream_info_.reset(new content::StreamInfo);

atom/common/native_mate_converters/v8_value_converter.cc

@@ -10,7 +10,6 @@
 #include <utility>
 
 #include "base/logging.h"
-#include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "native_mate/dictionary.h"
 
@@ -309,10 +308,10 @@ base::Value* V8ValueConverter::FromV8ValueImpl(
     return nullptr;
 
   if (val->IsExternal())
-    return base::MakeUnique<base::Value>().release();
+    return std::make_unique<base::Value>().release();
 
   if (val->IsNull())
-    return base::MakeUnique<base::Value>().release();
+    return std::make_unique<base::Value>().release();
 
   if (val->IsBoolean())
     return new base::Value(val->ToBoolean()->Value());
@@ -386,7 +385,7 @@ base::Value* V8ValueConverter::FromV8Array(
     v8::Isolate* isolate) const {
   ScopedUniquenessGuard uniqueness_guard(state, val);
   if (!uniqueness_guard.is_valid())
-    return base::MakeUnique<base::Value>().release();
+    return std::make_unique<base::Value>().release();
 
   std::unique_ptr<v8::Context::Scope> scope;
   // If val was created in a different context than our current one, change to
@@ -415,7 +414,7 @@ base::Value* V8ValueConverter::FromV8Array(
     else
       // JSON.stringify puts null in places where values don't serialize, for
       // example undefined and functions. Emulate that behavior.
-      result->Append(base::MakeUnique<base::Value>());
+      result->Append(std::make_unique<base::Value>());
   }
   return result;
 }
@@ -434,7 +433,7 @@ base::Value* V8ValueConverter::FromV8Object(
     v8::Isolate* isolate) const {
   ScopedUniquenessGuard uniqueness_guard(state, val);
   if (!uniqueness_guard.is_valid())
-    return base::MakeUnique<base::Value>().release();
+    return std::make_unique<base::Value>().release();
 
   std::unique_ptr<v8::Context::Scope> scope;
   // If val was created in a different context than our current one, change to

atom/renderer/renderer_client_base.cc

@@ -17,7 +17,6 @@
 #include "atom/renderer/guest_view_container.h"
 #include "atom/renderer/preferences_manager.h"
 #include "base/command_line.h"
-#include "base/memory/ptr_util.h"
 #include "base/strings/string_split.h"
 #include "chrome/renderer/media/chrome_key_systems.h"
 #include "chrome/renderer/pepper/pepper_helper.h"
@@ -190,7 +189,7 @@ void RendererClientBase::DidClearWindowObject(
 std::unique_ptr<blink::WebSpeechSynthesizer>
 RendererClientBase::OverrideSpeechSynthesizer(
     blink::WebSpeechSynthesizerClient* client) {
-  return base::MakeUnique<TtsDispatcher>(client);
+  return std::make_unique<TtsDispatcher>(client);
 }
 
 bool RendererClientBase::OverrideCreatePlugin(

atom/utility/atom_content_utility_client.cc

@@ -5,7 +5,6 @@
 #include "atom/utility/atom_content_utility_client.h"
 
 #if defined(OS_WIN)
-#include "base/memory/ptr_util.h"
 #include "chrome/utility/printing_handler_win.h"
 #endif
 
@@ -13,7 +12,7 @@ namespace atom {
 
 AtomContentUtilityClient::AtomContentUtilityClient() {
 #if defined(OS_WIN)
-  handlers_.push_back(base::MakeUnique<printing::PrintingHandlerWin>());
+  handlers_.push_back(std::make_unique<printing::PrintingHandlerWin>());
 #endif
 }
 

brightray/browser/browser_context.cc

@@ -149,7 +149,7 @@ net::URLRequestContextGetter* BrowserContext::CreateRequestContext(
 }
 
 std::unique_ptr<net::NetworkDelegate> BrowserContext::CreateNetworkDelegate() {
-  return base::MakeUnique<NetworkDelegate>();
+  return std::make_unique<NetworkDelegate>();
 }
 
 std::string BrowserContext::GetMediaDeviceIDSalt() {
@@ -165,7 +165,7 @@ base::FilePath BrowserContext::GetPath() const {
 std::unique_ptr<content::ZoomLevelDelegate>
 BrowserContext::CreateZoomLevelDelegate(const base::FilePath& partition_path) {
   if (!IsOffTheRecord()) {
-    return base::MakeUnique<ZoomLevelDelegate>(prefs(), partition_path);
+    return std::make_unique<ZoomLevelDelegate>(prefs(), partition_path);
   }
   return std::unique_ptr<content::ZoomLevelDelegate>();
 }

brightray/browser/browser_main_parts.cc

@@ -307,7 +307,7 @@ int BrowserMainParts::PreCreateThreads() {
     l10n_util::GetApplicationLocale(custom_locale_));
 
   // Manage global state of net and other IO thread related.
-  io_thread_ = base::MakeUnique<IOThread>();
+  io_thread_ = std::make_unique<IOThread>();
 
   return 0;
 }

brightray/browser/inspectable_web_contents_impl.cc

@@ -10,7 +10,6 @@
 #include "base/guid.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
-#include "base/memory/ptr_util.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/pattern.h"
 #include "base/strings/string_util.h"
@@ -828,7 +827,7 @@ void InspectableWebContentsImpl::OnURLFetchComplete(
   response.SetInteger("statusCode", rh ? rh->response_code() : 200);
 
   {
-    auto headers = base::MakeUnique<base::DictionaryValue>();
+    auto headers = std::make_unique<base::DictionaryValue>();
 
     size_t iterator = 0;
     std::string name;

brightray/browser/net_log.cc

@@ -9,7 +9,6 @@
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
-#include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "content/public/common/content_switches.h"
 #include "net/log/file_net_log_observer.h"
@@ -23,7 +22,7 @@ std::unique_ptr<base::DictionaryValue> GetConstants() {
   std::unique_ptr<base::DictionaryValue> constants = net::GetNetConstants();
 
   // Adding client information to constants dictionary.
-  auto client_info = base::MakeUnique<base::DictionaryValue>();
+  auto client_info = std::make_unique<base::DictionaryValue>();
   client_info->SetString(
       "command_line",
       base::CommandLine::ForCurrentProcess()->GetCommandLineString());

brightray/browser/url_request_context_getter.cc

@@ -220,7 +220,7 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
         url_request_context_->cookie_store()->AddCallbackForAllChanges(
             base::Bind(&URLRequestContextGetter::OnCookieChanged, this));
 
-    storage_->set_channel_id_service(base::MakeUnique<net::ChannelIDService>(
+    storage_->set_channel_id_service(std::make_unique<net::ChannelIDService>(
         new net::DefaultChannelIDStore(nullptr)));
 
     storage_->set_http_user_agent_settings(
@@ -306,10 +306,10 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
     storage_->set_http_server_properties(std::move(server_properties));
 
     std::unique_ptr<net::MultiLogCTVerifier> ct_verifier =
-        base::MakeUnique<net::MultiLogCTVerifier>();
+        std::make_unique<net::MultiLogCTVerifier>();
     ct_verifier->AddLogs(net::ct::CreateLogVerifiersForKnownLogs());
     storage_->set_cert_transparency_verifier(std::move(ct_verifier));
-    storage_->set_ct_policy_enforcer(base::MakeUnique<net::CTPolicyEnforcer>());
+    storage_->set_ct_policy_enforcer(std::make_unique<net::CTPolicyEnforcer>());
 
     net::HttpNetworkSession::Params network_session_params;
     network_session_params.ignore_certificate_errors = false;
@@ -346,7 +346,7 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
       backend.reset(delegate_->CreateHttpCacheBackendFactory(base_path_));
     }
 
-    storage_->set_http_transaction_factory(base::MakeUnique<net::HttpCache>(
+    storage_->set_http_transaction_factory(std::make_unique<net::HttpCache>(
         content::CreateDevToolsNetworkTransactionFactory(
             http_network_session_.get()),
         std::move(backend), false));

brightray/browser/zoom_level_delegate.cc

@@ -8,7 +8,6 @@
 #include <vector>
 
 #include "base/bind.h"
-#include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "components/prefs/json_pref_store.h"
@@ -89,7 +88,7 @@ void ZoomLevelDelegate::OnZoomLevelChanged(
   if (!host_zoom_dictionaries->GetDictionary(partition_key_,
                                              &host_zoom_dictionary)) {
     host_zoom_dictionary = host_zoom_dictionaries->SetDictionary(
-        partition_key_, base::MakeUnique<base::DictionaryValue>());
+        partition_key_, std::make_unique<base::DictionaryValue>());
   }
 
   if (modification_is_removal)

chromium_src/chrome/browser/icon_loader_auralinux.cc

@@ -5,7 +5,6 @@
 #include "chrome/browser/icon_loader.h"
 
 #include "base/bind.h"
-#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/nix/mime_util_xdg.h"
 #include "ui/views/linux_ui/linux_ui.h"
@@ -44,7 +43,7 @@ void IconLoader::ReadIcon() {
 
   views::LinuxUI* ui = views::LinuxUI::instance();
   if (ui) {
-    image = base::MakeUnique<gfx::Image>(
+    image = std::make_unique<gfx::Image>(
         ui->GetIconForContentType(group_, size_pixels));
     if (image->IsEmpty())
       image = nullptr;

chromium_src/chrome/browser/icon_loader_mac.mm

@@ -8,7 +8,6 @@
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
-#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/task_scheduler/post_task.h"
@@ -37,7 +36,7 @@ void IconLoader::ReadIcon() {
 
   if (icon_size_ == ALL) {
     // The NSImage already has all sizes.
-    image = base::MakeUnique<gfx::Image>([icon retain]);
+    image = std::make_unique<gfx::Image>([icon retain]);
   } else {
     NSSize size = NSZeroSize;
     switch (icon_size_) {
@@ -53,7 +52,7 @@ void IconLoader::ReadIcon() {
     gfx::ImageSkia image_skia(gfx::ImageSkiaFromResizedNSImage(icon, size));
     if (!image_skia.isNull()) {
       image_skia.MakeThreadSafe();
-      image = base::MakeUnique<gfx::Image>(image_skia);
+      image = std::make_unique<gfx::Image>(image_skia);
     }
   }
 

chromium_src/chrome/browser/icon_loader_win.cc

@@ -8,7 +8,6 @@
 #include <shellapi.h>
 
 #include "base/bind.h"
-#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/task_scheduler/post_task.h"
 #include "base/threading/thread.h"
@@ -65,7 +64,7 @@ void IconLoader::ReadIcon() {
       gfx::ImageSkia image_skia(gfx::ImageSkiaRep(*bitmap,
                                                   display::win::GetDPIScale()));
       image_skia.MakeThreadSafe();
-      image = base::MakeUnique<gfx::Image>(image_skia);
+      image = std::make_unique<gfx::Image>(image_skia);
       DestroyIcon(file_info.hIcon);
     }
   }

chromium_src/chrome/browser/printing/pdf_to_emf_converter.cc

@@ -17,7 +17,6 @@
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/common/chrome_utility_printing_messages.h"
 #include "content/public/browser/browser_thread.h"
@@ -228,10 +227,10 @@ PdfConverterUtilityProcessHostClient::GetFileFromTemp(
       temp_file) {
   if (settings_.mode == PdfRenderSettings::Mode::POSTSCRIPT_LEVEL2 ||
       settings_.mode == PdfRenderSettings::Mode::POSTSCRIPT_LEVEL3) {
-    return base::MakeUnique<PostScriptMetaFile>(temp_dir_,
+    return std::make_unique<PostScriptMetaFile>(temp_dir_,
                                                 std::move(temp_file));
   }
-  return base::MakeUnique<LazyEmf>(temp_dir_, std::move(temp_file));
+  return std::make_unique<LazyEmf>(temp_dir_, std::move(temp_file));
 }
 
 class PdfConverterImpl : public PdfConverter {
@@ -632,7 +631,7 @@ std::unique_ptr<PdfConverter> PdfConverter::StartPdfConverter(
     const PdfRenderSettings& conversion_settings,
     const StartCallback& start_callback) {
   std::unique_ptr<PdfConverterImpl> converter =
-      base::MakeUnique<PdfConverterImpl>();
+      std::make_unique<PdfConverterImpl>();
   converter->Start(
       new PdfConverterUtilityProcessHostClient(converter->GetWeakPtr(),
                                                conversion_settings),

chromium_src/chrome/browser/printing/print_job.cc

@@ -10,7 +10,6 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
-#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/task_scheduler/post_task.h"
@@ -267,7 +266,7 @@ void PrintJob::StartPdfToEmfConversion(
     bool print_text_with_gdi) {
   DCHECK(!pdf_conversion_state_);
   pdf_conversion_state_ =
-      base::MakeUnique<PdfConversionState>(page_size, content_area);
+      std::make_unique<PdfConversionState>(page_size, content_area);
   const int kPrinterDpi = settings().dpi();
   PdfRenderSettings settings(
       content_area, gfx::Point(0, 0), kPrinterDpi, /*autorotate=*/true,
@@ -314,7 +313,7 @@ void PrintJob::StartPdfToPostScriptConversion(
     const gfx::Point& physical_offsets,
     bool ps_level2) {
   DCHECK(!pdf_conversion_state_);
-  pdf_conversion_state_ = base::MakeUnique<PdfConversionState>(
+  pdf_conversion_state_ = std::make_unique<PdfConversionState>(
       gfx::Size(), gfx::Rect());
   const int kPrinterDpi = settings().dpi();
   PdfRenderSettings settings(

chromium_src/chrome/browser/printing/print_job_worker.cc

@@ -11,7 +11,6 @@
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/location.h"
-#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ -99,7 +98,7 @@ void PrintSettingsToJobSettings(const PrintSettings& settings,
   // range
 
   if (!settings.ranges().empty()) {
-    auto page_range_array = base::MakeUnique<base::ListValue>();
+    auto page_range_array = std::make_unique<base::ListValue>();
     job_settings->Set(kSettingPageRange, std::move(page_range_array));
     for (size_t i = 0; i < settings.ranges().size(); ++i) {
       std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
@@ -200,7 +199,7 @@ PrintJobWorker::PrintJobWorker(int render_process_id,
   // The object is created in the IO thread.
   DCHECK(owner_->RunsTasksInCurrentSequence());
 
-  printing_context_delegate_ = base::MakeUnique<PrintingContextDelegate>(
+  printing_context_delegate_ = std::make_unique<PrintingContextDelegate>(
       render_process_id, render_frame_id);
   printing_context_ = PrintingContext::Create(printing_context_delegate_.get());
 }

chromium_src/chrome/browser/printing/print_view_manager_base.cc

@@ -8,7 +8,6 @@
 
 #include "base/bind.h"
 #include "base/memory/ref_counted_memory.h"
-#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ -73,7 +72,7 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh,
   int32_t id = rfh->GetRoutingID();
   return PrintNowInternal(
       rfh,
-      base::MakeUnique<PrintMsg_PrintPages>(id, silent, print_background, device_name));
+      std::make_unique<PrintMsg_PrintPages>(id, silent, print_background, device_name));
 }
 #endif  // !DISABLE_BASIC_PRINTING
 

chromium_src/chrome/browser/process_singleton_posix.cc

@@ -67,7 +67,6 @@
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram_macros.h"
@@ -585,7 +584,7 @@ void ProcessSingleton::LinuxWatcher::OnSocketCanReadWithoutBlocking(
   DCHECK(base::SetNonBlocking(connection_socket))
       << "Failed to make non-blocking socket.";
   readers_.insert(
-      base::MakeUnique<SocketReader>(this, ui_task_runner_, connection_socket));
+      std::make_unique<SocketReader>(this, ui_task_runner_, connection_socket));
 }
 
 void ProcessSingleton::LinuxWatcher::StartListening(int socket) {

chromium_src/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc

@@ -17,7 +17,6 @@
 #include "ppapi/shared_impl/ppapi_permissions.h"
 
 #if defined(ENABLE_PDF_VIEWER)
-#include "base/memory/ptr_util.h"
 #include "components/pdf/renderer/pepper_pdf_host.h"
 #endif  // defined(ENABLE_PDF_VIEWER)
 
@@ -89,7 +88,7 @@ std::unique_ptr<ResourceHost> ChromeRendererPepperHostFactory::CreateResourceHos
           ppapi::PERMISSION_PRIVATE)) {
     switch (message.type()) {
       case PpapiHostMsg_PDF_Create::ID: {
-        return base::MakeUnique<pdf::PepperPDFHost>(host_, instance, resource);
+        return std::make_unique<pdf::PepperPDFHost>(host_, instance, resource);
       }
     }
   }