From b05932310baafb968ff69498bff6deaa7c89ccfb Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Thu, 12 Apr 2018 08:48:32 -0400 Subject: [PATCH] replace base::MakeUnique with std::make_unique --- atom/browser/api/atom_api_session.cc | 2 +- atom/browser/api/trackable_object.cc | 2 +- atom/browser/atom_browser_context.cc | 2 +- atom/browser/atom_permission_manager.cc | 2 +- atom/browser/common_web_contents_delegate.cc | 4 ++-- atom/browser/mac/dict_util.mm | 8 ++++---- atom/browser/net/atom_cert_verifier.cc | 2 +- atom/browser/osr/osr_render_widget_host_view.cc | 6 +++--- atom/browser/ui/webui/pdf_viewer_handler.cc | 8 ++++---- atom/browser/ui/webui/pdf_viewer_ui.cc | 2 +- .../native_mate_converters/v8_value_converter.cc | 10 +++++----- atom/renderer/renderer_client_base.cc | 2 +- atom/utility/atom_content_utility_client.cc | 2 +- brightray/browser/browser_context.cc | 4 ++-- brightray/browser/browser_main_parts.cc | 2 +- brightray/browser/inspectable_web_contents_impl.cc | 2 +- brightray/browser/net_log.cc | 2 +- brightray/browser/url_request_context_getter.cc | 8 ++++---- brightray/browser/zoom_level_delegate.cc | 2 +- chromium_src/chrome/browser/icon_loader_auralinux.cc | 2 +- chromium_src/chrome/browser/icon_loader_mac.mm | 4 ++-- chromium_src/chrome/browser/icon_loader_win.cc | 2 +- .../chrome/browser/printing/pdf_to_emf_converter.cc | 6 +++--- chromium_src/chrome/browser/printing/print_job.cc | 4 ++-- .../chrome/browser/printing/print_job_worker.cc | 4 ++-- .../chrome/browser/printing/print_view_manager_base.cc | 2 +- chromium_src/chrome/browser/process_singleton_posix.cc | 2 +- .../pepper/chrome_renderer_pepper_host_factory.cc | 2 +- 28 files changed, 50 insertions(+), 50 deletions(-) diff --git a/atom/browser/api/atom_api_session.cc b/atom/browser/api/atom_api_session.cc index 4233c6b1f18c..ce5cb8f68b1a 100644 --- a/atom/browser/api/atom_api_session.cc +++ b/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(); + auto conditions = std::make_unique(); content::DevToolsNetworkController::SetNetworkState( devtools_network_emulation_client_id_, std::move(conditions)); BrowserThread::PostTask( diff --git a/atom/browser/api/trackable_object.cc b/atom/browser/api/trackable_object.cc index d305657ba7b6..1455838b9862 100644 --- a/atom/browser/api/trackable_object.cc +++ b/atom/browser/api/trackable_object.cc @@ -49,7 +49,7 @@ void TrackableObjectBase::Destroy() { void TrackableObjectBase::AttachAsUserData(base::SupportsUserData* wrapped) { wrapped->SetUserData(kTrackedObjectKey, - base::MakeUnique(weak_map_id_)); + std::make_unique(weak_map_id_)); } // static diff --git a/atom/browser/atom_browser_context.cc b/atom/browser/atom_browser_context.cc index d54a39330967..ede18c88fe39 100644 --- a/atom/browser/atom_browser_context.cc +++ b/atom/browser/atom_browser_context.cc @@ -111,7 +111,7 @@ AtomBrowserContext::RegisterCookieChangeCallback( std::unique_ptr AtomBrowserContext::CreateNetworkDelegate() { - return base::MakeUnique(); + return std::make_unique(); } std::string AtomBrowserContext::GetUserAgent() { diff --git a/atom/browser/atom_permission_manager.cc b/atom/browser/atom_permission_manager.cc index e3e9c94ce96e..e6d6f58e0e5a 100644 --- a/atom/browser/atom_permission_manager.cc +++ b/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( + int request_id = pending_requests_.Add(std::make_unique( render_frame_host, permissions, response_callback)); for (size_t i = 0; i < permissions.size(); ++i) { diff --git a/atom/browser/common_web_contents_delegate.cc b/atom/browser/common_web_contents_delegate.cc index 67f7fa0cf9d4..677197ec1049 100644 --- a/atom/browser/common_web_contents_delegate.cc +++ b/atom/browser/common_web_contents_delegate.cc @@ -186,7 +186,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(owner_window_); + auto relay = std::make_unique(owner_window_); auto relay_key = relay->key; if (owner_window) { #if defined(TOOLKIT_VIEWS) @@ -397,7 +397,7 @@ void CommonWebContentsDelegate::DevToolsAddFileSystem( auto pref_service = GetPrefService(GetDevToolsWebContents()); DictionaryPrefUpdate update(pref_service, prefs::kDevToolsFileSystemPaths); update.Get()->SetWithoutPathExpansion( - path.AsUTF8Unsafe(), base::MakeUnique()); + path.AsUTF8Unsafe(), std::make_unique()); web_contents_->CallClientFunction("DevToolsAPI.fileSystemAdded", file_system_value.get(), diff --git a/atom/browser/mac/dict_util.mm b/atom/browser/mac/dict_util.mm index 5761e9a43698..0da6ea10042c 100644 --- a/atom/browser/mac/dict_util.mm +++ b/atom/browser/mac/dict_util.mm @@ -46,14 +46,14 @@ std::unique_ptr NSArrayToListValue(NSArray* arr) { if (sub_arr) result->Append(std::move(sub_arr)); else - result->Append(base::MakeUnique()); + result->Append(std::make_unique()); } else if ([value isKindOfClass:[NSDictionary class]]) { std::unique_ptr sub_dict = NSDictionaryToDictionaryValue(value); if (sub_dict) result->Append(std::move(sub_dict)); else - result->Append(base::MakeUnique()); + result->Append(std::make_unique()); } else { result->AppendString(base::SysNSStringToUTF8([value description])); } @@ -104,7 +104,7 @@ std::unique_ptr NSDictionaryToDictionaryValue( result->SetWithoutPathExpansion(str_key, std::move(sub_arr)); else result->SetWithoutPathExpansion(str_key, - base::MakeUnique()); + std::make_unique()); } else if ([value isKindOfClass:[NSDictionary class]]) { std::unique_ptr sub_dict = NSDictionaryToDictionaryValue(value); @@ -112,7 +112,7 @@ std::unique_ptr NSDictionaryToDictionaryValue( result->SetWithoutPathExpansion(str_key, std::move(sub_dict)); else result->SetWithoutPathExpansion(str_key, - base::MakeUnique()); + std::make_unique()); } else { result->SetKey(str_key, base::Value(base::SysNSStringToUTF8([value description]))); diff --git a/atom/browser/net/atom_cert_verifier.cc b/atom/browser/net/atom_cert_verifier.cc index 189dd4878aa7..ba0837979d80 100644 --- a/atom/browser/net/atom_cert_verifier.cc +++ b/atom/browser/net/atom_cert_verifier.cc @@ -177,7 +177,7 @@ int AtomCertVerifier::Verify( if (!request) { out_req->reset(); std::unique_ptr new_request = - base::MakeUnique(params, this); + std::make_unique(params, this); new_request->Start(crl_set, net_log); request = new_request.get(); *out_req = std::move(new_request); diff --git a/atom/browser/osr/osr_render_widget_host_view.cc b/atom/browser/osr/osr_render_widget_host_view.cc index e7c7d82bf3cd..348551ea3e49 100644 --- a/atom/browser/osr/osr_render_widget_host_view.cc +++ b/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( + delegated_frame_host_ = std::make_unique( AllocateFrameSinkId(is_guest_view_hack), this, false /* enable_surface_synchronization */); @@ -788,7 +788,7 @@ std::unique_ptr OffScreenRenderWidgetHostView::DelegatedFrameHostCreateResizeLock() { HoldResize(); const gfx::Size& desired_size = GetRootLayer()->bounds().size(); - return base::MakeUnique(this, desired_size); + return std::make_unique(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( + guest_host_view->RegisterFrameSwappedCallback(std::make_unique( base::Bind(&OffScreenRenderWidgetHostView::OnGuestViewFrameSwapped, weak_ptr_factory_.GetWeakPtr(), base::Unretained(guest_host_view)))); diff --git a/atom/browser/ui/webui/pdf_viewer_handler.cc b/atom/browser/ui/webui/pdf_viewer_handler.cc index e4ba5be3baba..ae5ef50a62ed 100644 --- a/atom/browser/ui/webui/pdf_viewer_handler.cc +++ b/atom/browser/ui/webui/pdf_viewer_handler.cc @@ -45,7 +45,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(); + auto headers_dict = std::make_unique(); auto stream_url = stream->handle->GetURL().spec(); CreateResponseHeadersDictionary(stream->response_headers.get(), headers_dict.get()); @@ -66,7 +66,7 @@ PdfViewerHandler::~PdfViewerHandler() { void PdfViewerHandler::SetPdfResourceStream(content::StreamInfo* stream) { stream_ = stream; if (!!initialize_callback_id_.get()) { - auto list = base::MakeUnique(); + auto list = std::make_unique(); list->Set(0, std::move(initialize_callback_id_)); Initialize(list.get()); } @@ -109,7 +109,7 @@ void PdfViewerHandler::Initialize(const base::ListValue* args) { CHECK(!initialize_callback_id_.get()); AllowJavascript(); - auto stream_info = base::MakeUnique(); + auto stream_info = std::make_unique(); PopulateStreamInfo(stream_info.get(), stream_, original_url_); ResolveJavascriptCallback(*callback_id, *stream_info); } else { @@ -174,7 +174,7 @@ void PdfViewerHandler::GetStrings(const base::ListValue* args) { const base::Value* callback_id; CHECK(args->Get(0, &callback_id)); - auto result = base::MakeUnique(); + auto result = std::make_unique(); // TODO(deepak1556): Generate strings from components/pdf_strings.grdp. #define SET_STRING(id, resource) result->SetString(id, resource) SET_STRING("passwordPrompt", diff --git a/atom/browser/ui/webui/pdf_viewer_ui.cc b/atom/browser/ui/webui/pdf_viewer_ui.cc index be154aeddfb2..0fc7e85321db 100644 --- a/atom/browser/ui/webui/pdf_viewer_ui.cc +++ b/atom/browser/ui/webui/pdf_viewer_ui.cc @@ -145,7 +145,7 @@ class PdfViewerUI::ResourceRequester content::GetStreamContextForResourceContext(resource_context); std::unique_ptr handler = - base::MakeUnique( + std::make_unique( request.get(), stream_context->registry(), origin, false); info->set_is_stream(true); stream_info_.reset(new content::StreamInfo); diff --git a/atom/common/native_mate_converters/v8_value_converter.cc b/atom/common/native_mate_converters/v8_value_converter.cc index b4935b5e3ff3..edc2a030aeae 100644 --- a/atom/common/native_mate_converters/v8_value_converter.cc +++ b/atom/common/native_mate_converters/v8_value_converter.cc @@ -309,10 +309,10 @@ base::Value* V8ValueConverter::FromV8ValueImpl( return nullptr; if (val->IsExternal()) - return base::MakeUnique().release(); + return std::make_unique().release(); if (val->IsNull()) - return base::MakeUnique().release(); + return std::make_unique().release(); if (val->IsBoolean()) return new base::Value(val->ToBoolean()->Value()); @@ -386,7 +386,7 @@ base::Value* V8ValueConverter::FromV8Array( v8::Isolate* isolate) const { ScopedUniquenessGuard uniqueness_guard(state, val); if (!uniqueness_guard.is_valid()) - return base::MakeUnique().release(); + return std::make_unique().release(); std::unique_ptr scope; // If val was created in a different context than our current one, change to @@ -415,7 +415,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()); + result->Append(std::make_unique()); } return result; } @@ -434,7 +434,7 @@ base::Value* V8ValueConverter::FromV8Object( v8::Isolate* isolate) const { ScopedUniquenessGuard uniqueness_guard(state, val); if (!uniqueness_guard.is_valid()) - return base::MakeUnique().release(); + return std::make_unique().release(); std::unique_ptr scope; // If val was created in a different context than our current one, change to diff --git a/atom/renderer/renderer_client_base.cc b/atom/renderer/renderer_client_base.cc index 2bbe41b8d6bd..2a9ee47029f5 100644 --- a/atom/renderer/renderer_client_base.cc +++ b/atom/renderer/renderer_client_base.cc @@ -190,7 +190,7 @@ void RendererClientBase::DidClearWindowObject( std::unique_ptr RendererClientBase::OverrideSpeechSynthesizer( blink::WebSpeechSynthesizerClient* client) { - return base::MakeUnique(client); + return std::make_unique(client); } bool RendererClientBase::OverrideCreatePlugin( diff --git a/atom/utility/atom_content_utility_client.cc b/atom/utility/atom_content_utility_client.cc index 653aca2b8618..49e6189f4b78 100644 --- a/atom/utility/atom_content_utility_client.cc +++ b/atom/utility/atom_content_utility_client.cc @@ -13,7 +13,7 @@ namespace atom { AtomContentUtilityClient::AtomContentUtilityClient() { #if defined(OS_WIN) - handlers_.push_back(base::MakeUnique()); + handlers_.push_back(std::make_unique()); #endif } diff --git a/brightray/browser/browser_context.cc b/brightray/browser/browser_context.cc index 1c5b5916ab35..d8699a2b56eb 100644 --- a/brightray/browser/browser_context.cc +++ b/brightray/browser/browser_context.cc @@ -149,7 +149,7 @@ net::URLRequestContextGetter* BrowserContext::CreateRequestContext( } std::unique_ptr BrowserContext::CreateNetworkDelegate() { - return base::MakeUnique(); + return std::make_unique(); } std::string BrowserContext::GetMediaDeviceIDSalt() { @@ -165,7 +165,7 @@ base::FilePath BrowserContext::GetPath() const { std::unique_ptr BrowserContext::CreateZoomLevelDelegate(const base::FilePath& partition_path) { if (!IsOffTheRecord()) { - return base::MakeUnique(prefs(), partition_path); + return std::make_unique(prefs(), partition_path); } return std::unique_ptr(); } diff --git a/brightray/browser/browser_main_parts.cc b/brightray/browser/browser_main_parts.cc index 5c6e79432161..c3edcea22b10 100644 --- a/brightray/browser/browser_main_parts.cc +++ b/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(); + io_thread_ = std::make_unique(); return 0; } diff --git a/brightray/browser/inspectable_web_contents_impl.cc b/brightray/browser/inspectable_web_contents_impl.cc index bb51298d9574..3e20e7747abc 100644 --- a/brightray/browser/inspectable_web_contents_impl.cc +++ b/brightray/browser/inspectable_web_contents_impl.cc @@ -828,7 +828,7 @@ void InspectableWebContentsImpl::OnURLFetchComplete( response.SetInteger("statusCode", rh ? rh->response_code() : 200); { - auto headers = base::MakeUnique(); + auto headers = std::make_unique(); size_t iterator = 0; std::string name; diff --git a/brightray/browser/net_log.cc b/brightray/browser/net_log.cc index 7a798ae98e6c..65e3e36fd488 100644 --- a/brightray/browser/net_log.cc +++ b/brightray/browser/net_log.cc @@ -23,7 +23,7 @@ std::unique_ptr GetConstants() { std::unique_ptr constants = net::GetNetConstants(); // Adding client information to constants dictionary. - auto client_info = base::MakeUnique(); + auto client_info = std::make_unique(); client_info->SetString( "command_line", base::CommandLine::ForCurrentProcess()->GetCommandLineString()); diff --git a/brightray/browser/url_request_context_getter.cc b/brightray/browser/url_request_context_getter.cc index 6d8f03f9ed16..07f52a882a2f 100644 --- a/brightray/browser/url_request_context_getter.cc +++ b/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( + storage_->set_channel_id_service(std::make_unique( 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 ct_verifier = - base::MakeUnique(); + std::make_unique(); ct_verifier->AddLogs(net::ct::CreateLogVerifiersForKnownLogs()); storage_->set_cert_transparency_verifier(std::move(ct_verifier)); - storage_->set_ct_policy_enforcer(base::MakeUnique()); + storage_->set_ct_policy_enforcer(std::make_unique()); 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( + storage_->set_http_transaction_factory(std::make_unique( content::CreateDevToolsNetworkTransactionFactory( http_network_session_.get()), std::move(backend), false)); diff --git a/brightray/browser/zoom_level_delegate.cc b/brightray/browser/zoom_level_delegate.cc index 694223d742d5..633647b42ba4 100644 --- a/brightray/browser/zoom_level_delegate.cc +++ b/brightray/browser/zoom_level_delegate.cc @@ -89,7 +89,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()); + partition_key_, std::make_unique()); } if (modification_is_removal) diff --git a/chromium_src/chrome/browser/icon_loader_auralinux.cc b/chromium_src/chrome/browser/icon_loader_auralinux.cc index 484f6888c17c..ee6181ef4874 100644 --- a/chromium_src/chrome/browser/icon_loader_auralinux.cc +++ b/chromium_src/chrome/browser/icon_loader_auralinux.cc @@ -44,7 +44,7 @@ void IconLoader::ReadIcon() { views::LinuxUI* ui = views::LinuxUI::instance(); if (ui) { - image = base::MakeUnique( + image = std::make_unique( ui->GetIconForContentType(group_, size_pixels)); if (image->IsEmpty()) image = nullptr; diff --git a/chromium_src/chrome/browser/icon_loader_mac.mm b/chromium_src/chrome/browser/icon_loader_mac.mm index f10b47d27a6e..6ad8891ddd9e 100644 --- a/chromium_src/chrome/browser/icon_loader_mac.mm +++ b/chromium_src/chrome/browser/icon_loader_mac.mm @@ -37,7 +37,7 @@ void IconLoader::ReadIcon() { if (icon_size_ == ALL) { // The NSImage already has all sizes. - image = base::MakeUnique([icon retain]); + image = std::make_unique([icon retain]); } else { NSSize size = NSZeroSize; switch (icon_size_) { @@ -53,7 +53,7 @@ void IconLoader::ReadIcon() { gfx::ImageSkia image_skia(gfx::ImageSkiaFromResizedNSImage(icon, size)); if (!image_skia.isNull()) { image_skia.MakeThreadSafe(); - image = base::MakeUnique(image_skia); + image = std::make_unique(image_skia); } } diff --git a/chromium_src/chrome/browser/icon_loader_win.cc b/chromium_src/chrome/browser/icon_loader_win.cc index 1d0912bd5185..1112e32b24f4 100644 --- a/chromium_src/chrome/browser/icon_loader_win.cc +++ b/chromium_src/chrome/browser/icon_loader_win.cc @@ -65,7 +65,7 @@ void IconLoader::ReadIcon() { gfx::ImageSkia image_skia(gfx::ImageSkiaRep(*bitmap, display::win::GetDPIScale())); image_skia.MakeThreadSafe(); - image = base::MakeUnique(image_skia); + image = std::make_unique(image_skia); DestroyIcon(file_info.hIcon); } } diff --git a/chromium_src/chrome/browser/printing/pdf_to_emf_converter.cc b/chromium_src/chrome/browser/printing/pdf_to_emf_converter.cc index 4774544cf2c8..4e01ab4fc0e2 100644 --- a/chromium_src/chrome/browser/printing/pdf_to_emf_converter.cc +++ b/chromium_src/chrome/browser/printing/pdf_to_emf_converter.cc @@ -228,10 +228,10 @@ PdfConverterUtilityProcessHostClient::GetFileFromTemp( temp_file) { if (settings_.mode == PdfRenderSettings::Mode::POSTSCRIPT_LEVEL2 || settings_.mode == PdfRenderSettings::Mode::POSTSCRIPT_LEVEL3) { - return base::MakeUnique(temp_dir_, + return std::make_unique(temp_dir_, std::move(temp_file)); } - return base::MakeUnique(temp_dir_, std::move(temp_file)); + return std::make_unique(temp_dir_, std::move(temp_file)); } class PdfConverterImpl : public PdfConverter { @@ -632,7 +632,7 @@ std::unique_ptr PdfConverter::StartPdfConverter( const PdfRenderSettings& conversion_settings, const StartCallback& start_callback) { std::unique_ptr converter = - base::MakeUnique(); + std::make_unique(); converter->Start( new PdfConverterUtilityProcessHostClient(converter->GetWeakPtr(), conversion_settings), diff --git a/chromium_src/chrome/browser/printing/print_job.cc b/chromium_src/chrome/browser/printing/print_job.cc index 68c6aefa33da..c2b9492434d5 100644 --- a/chromium_src/chrome/browser/printing/print_job.cc +++ b/chromium_src/chrome/browser/printing/print_job.cc @@ -267,7 +267,7 @@ void PrintJob::StartPdfToEmfConversion( bool print_text_with_gdi) { DCHECK(!pdf_conversion_state_); pdf_conversion_state_ = - base::MakeUnique(page_size, content_area); + std::make_unique(page_size, content_area); const int kPrinterDpi = settings().dpi(); PdfRenderSettings settings( content_area, gfx::Point(0, 0), kPrinterDpi, /*autorotate=*/true, @@ -314,7 +314,7 @@ void PrintJob::StartPdfToPostScriptConversion( const gfx::Point& physical_offsets, bool ps_level2) { DCHECK(!pdf_conversion_state_); - pdf_conversion_state_ = base::MakeUnique( + pdf_conversion_state_ = std::make_unique( gfx::Size(), gfx::Rect()); const int kPrinterDpi = settings().dpi(); PdfRenderSettings settings( diff --git a/chromium_src/chrome/browser/printing/print_job_worker.cc b/chromium_src/chrome/browser/printing/print_job_worker.cc index a0e3e3ff40f0..ba2fe4cda55e 100644 --- a/chromium_src/chrome/browser/printing/print_job_worker.cc +++ b/chromium_src/chrome/browser/printing/print_job_worker.cc @@ -99,7 +99,7 @@ void PrintSettingsToJobSettings(const PrintSettings& settings, // range if (!settings.ranges().empty()) { - auto page_range_array = base::MakeUnique(); + auto page_range_array = std::make_unique(); job_settings->Set(kSettingPageRange, std::move(page_range_array)); for (size_t i = 0; i < settings.ranges().size(); ++i) { std::unique_ptr dict(new base::DictionaryValue); @@ -200,7 +200,7 @@ PrintJobWorker::PrintJobWorker(int render_process_id, // The object is created in the IO thread. DCHECK(owner_->RunsTasksInCurrentSequence()); - printing_context_delegate_ = base::MakeUnique( + printing_context_delegate_ = std::make_unique( render_process_id, render_frame_id); printing_context_ = PrintingContext::Create(printing_context_delegate_.get()); } diff --git a/chromium_src/chrome/browser/printing/print_view_manager_base.cc b/chromium_src/chrome/browser/printing/print_view_manager_base.cc index a7ccf6796c2c..b9d8585794cc 100644 --- a/chromium_src/chrome/browser/printing/print_view_manager_base.cc +++ b/chromium_src/chrome/browser/printing/print_view_manager_base.cc @@ -73,7 +73,7 @@ bool PrintViewManagerBase::PrintNow(content::RenderFrameHost* rfh, int32_t id = rfh->GetRoutingID(); return PrintNowInternal( rfh, - base::MakeUnique(id, silent, print_background, device_name)); + std::make_unique(id, silent, print_background, device_name)); } #endif // !DISABLE_BASIC_PRINTING diff --git a/chromium_src/chrome/browser/process_singleton_posix.cc b/chromium_src/chrome/browser/process_singleton_posix.cc index 50c6a1877f10..b62b706e83b9 100644 --- a/chromium_src/chrome/browser/process_singleton_posix.cc +++ b/chromium_src/chrome/browser/process_singleton_posix.cc @@ -585,7 +585,7 @@ void ProcessSingleton::LinuxWatcher::OnSocketCanReadWithoutBlocking( DCHECK(base::SetNonBlocking(connection_socket)) << "Failed to make non-blocking socket."; readers_.insert( - base::MakeUnique(this, ui_task_runner_, connection_socket)); + std::make_unique(this, ui_task_runner_, connection_socket)); } void ProcessSingleton::LinuxWatcher::StartListening(int socket) { diff --git a/chromium_src/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc b/chromium_src/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc index c4046d924102..e849b7f06be0 100644 --- a/chromium_src/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc +++ b/chromium_src/chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc @@ -89,7 +89,7 @@ std::unique_ptr ChromeRendererPepperHostFactory::CreateResourceHos ppapi::PERMISSION_PRIVATE)) { switch (message.type()) { case PpapiHostMsg_PDF_Create::ID: { - return base::MakeUnique(host_, instance, resource); + return std::make_unique(host_, instance, resource); } } }