| Index: components/printing/renderer/print_web_view_helper.cc
|
| diff --git a/components/printing/renderer/print_web_view_helper.cc b/components/printing/renderer/print_web_view_helper.cc
|
| index 9ee4cd9cc3c91ab72584ea76c0223434075fdbab..32ded53cec22c109327955ee2168ad0d5d1050ea 100644
|
| --- a/components/printing/renderer/print_web_view_helper.cc
|
| +++ b/components/printing/renderer/print_web_view_helper.cc
|
| @@ -534,7 +534,7 @@ void PrintWebViewHelper::PrintHeaderAndFooter(
|
| // Load page with script to avoid async operations.
|
| ExecuteScript(frame, kPageLoadScriptFormat, html);
|
|
|
| - scoped_ptr<base::DictionaryValue> options(new base::DictionaryValue());
|
| + std::unique_ptr<base::DictionaryValue> options(new base::DictionaryValue());
|
| options.reset(new base::DictionaryValue());
|
| options->SetDouble(kSettingHeaderFooterDate, base::Time::Now().ToJsTime());
|
| options->SetDouble("width", page_size.width);
|
| @@ -829,7 +829,7 @@ bool PrintWebViewHelper::Delegate::IsScriptedPrintEnabled() {
|
| }
|
|
|
| PrintWebViewHelper::PrintWebViewHelper(content::RenderView* render_view,
|
| - scoped_ptr<Delegate> delegate)
|
| + std::unique_ptr<Delegate> delegate)
|
| : content::RenderViewObserver(render_view),
|
| content::RenderViewObserverTracker<PrintWebViewHelper>(render_view),
|
| reset_prep_frame_view_(false),
|
| @@ -1242,7 +1242,7 @@ bool PrintWebViewHelper::RenderPreviewPage(
|
| PrintMsg_PrintPage_Params page_params;
|
| page_params.params = print_params;
|
| page_params.page_number = page_number;
|
| - scoped_ptr<PdfMetafileSkia> draft_metafile;
|
| + std::unique_ptr<PdfMetafileSkia> draft_metafile;
|
| PdfMetafileSkia* initial_render_metafile = print_preview_context_.metafile();
|
| if (print_preview_context_.IsModifiable() && is_print_ready_metafile_sent_) {
|
| draft_metafile.reset(new PdfMetafileSkia);
|
| @@ -1820,7 +1820,7 @@ bool PrintWebViewHelper::CopyMetafileDataToSharedMem(
|
| if (buf_size == 0)
|
| return false;
|
|
|
| - scoped_ptr<base::SharedMemory> shared_buf(
|
| + std::unique_ptr<base::SharedMemory> shared_buf(
|
| content::RenderThread::Get()->HostAllocateSharedMemoryBuffer(buf_size));
|
| if (!shared_buf)
|
| return false;
|
|
|