Index: chrome/browser/ui/webui/print_preview/print_preview_handler.cc |
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc |
index f57b988d55e599965c93d24e53fc6e5eb086755b..5068fb081ab50dfb3d593fd7a0a3fbfe77f7150c 100644 |
--- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc |
+++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc |
@@ -6,7 +6,9 @@ |
#include <ctype.h> |
#include <stddef.h> |
+ |
#include <map> |
+#include <memory> |
#include <string> |
#include <utility> |
@@ -20,7 +22,6 @@ |
#include "base/lazy_instance.h" |
#include "base/macros.h" |
#include "base/memory/ref_counted_memory.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/metrics/histogram.h" |
#include "base/path_service.h" |
#include "base/strings/string_number_conversions.h" |
@@ -182,7 +183,7 @@ const char kPrinterCapabilities[] = "capabilities"; |
// Get the print job settings dictionary from |args|. The caller takes |
// ownership of the returned DictionaryValue. Returns NULL on failure. |
-scoped_ptr<base::DictionaryValue> GetSettingsDictionary( |
+std::unique_ptr<base::DictionaryValue> GetSettingsDictionary( |
const base::ListValue* args) { |
std::string json_str; |
if (!args->GetString(0, &json_str)) { |
@@ -193,7 +194,7 @@ scoped_ptr<base::DictionaryValue> GetSettingsDictionary( |
NOTREACHED() << "Empty print job settings"; |
return NULL; |
} |
- scoped_ptr<base::DictionaryValue> settings = |
+ std::unique_ptr<base::DictionaryValue> settings = |
base::DictionaryValue::From(base::JSONReader::Read(json_str)); |
if (!settings) { |
NOTREACHED() << "Print job settings must be a dictionary."; |
@@ -326,7 +327,7 @@ class PrintingContextDelegate : public printing::PrintingContext::Delegate { |
gfx::Size GetDefaultPdfMediaSizeMicrons() { |
PrintingContextDelegate delegate; |
- scoped_ptr<printing::PrintingContext> printing_context( |
+ std::unique_ptr<printing::PrintingContext> printing_context( |
printing::PrintingContext::Create(&delegate)); |
if (printing::PrintingContext::OK != printing_context->UsePdfSettings() || |
printing_context->settings().device_units_per_inch() <= 0) { |
@@ -343,7 +344,7 @@ gfx::Size GetDefaultPdfMediaSizeMicrons() { |
typedef base::Callback<void(const base::DictionaryValue*)> |
GetPdfCapabilitiesCallback; |
-scoped_ptr<base::DictionaryValue> GetPdfCapabilitiesOnFileThread( |
+std::unique_ptr<base::DictionaryValue> GetPdfCapabilitiesOnFileThread( |
const std::string& locale) { |
DCHECK_CURRENTLY_ON(BrowserThread::FILE); |
@@ -392,10 +393,10 @@ scoped_ptr<base::DictionaryValue> GetPdfCapabilitiesOnFileThread( |
} |
media.SaveTo(&description); |
- return scoped_ptr<base::DictionaryValue>(description.root().DeepCopy()); |
+ return std::unique_ptr<base::DictionaryValue>(description.root().DeepCopy()); |
} |
-scoped_ptr<base::DictionaryValue> GetLocalPrinterCapabilitiesOnFileThread( |
+std::unique_ptr<base::DictionaryValue> GetLocalPrinterCapabilitiesOnFileThread( |
const std::string& printer_name) { |
DCHECK_CURRENTLY_ON(BrowserThread::FILE); |
@@ -408,20 +409,20 @@ scoped_ptr<base::DictionaryValue> GetLocalPrinterCapabilitiesOnFileThread( |
if (!print_backend->IsValidPrinter(printer_name)) { |
LOG(WARNING) << "Invalid printer " << printer_name; |
- return scoped_ptr<base::DictionaryValue>(); |
+ return std::unique_ptr<base::DictionaryValue>(); |
} |
printing::PrinterSemanticCapsAndDefaults info; |
if (!print_backend->GetPrinterSemanticCapsAndDefaults(printer_name, &info)) { |
LOG(WARNING) << "Failed to get capabilities for " << printer_name; |
- return scoped_ptr<base::DictionaryValue>(); |
+ return std::unique_ptr<base::DictionaryValue>(); |
} |
- scoped_ptr<base::DictionaryValue> description( |
+ std::unique_ptr<base::DictionaryValue> description( |
cloud_print::PrinterSemanticCapsAndDefaultsToCdd(info)); |
if (!description) { |
LOG(WARNING) << "Failed to convert capabilities for " << printer_name; |
- return scoped_ptr<base::DictionaryValue>(); |
+ return std::unique_ptr<base::DictionaryValue>(); |
} |
return description; |
@@ -488,17 +489,18 @@ void GetPrinterCapabilitiesOnFileThread( |
DCHECK_CURRENTLY_ON(BrowserThread::FILE); |
DCHECK(!printer_name.empty()); |
- scoped_ptr<base::DictionaryValue> printer_capabilities( |
- printer_name == kLocalPdfPrinterId ? |
- GetPdfCapabilitiesOnFileThread(locale) : |
- GetLocalPrinterCapabilitiesOnFileThread(printer_name)); |
+ std::unique_ptr<base::DictionaryValue> printer_capabilities( |
+ printer_name == kLocalPdfPrinterId |
+ ? GetPdfCapabilitiesOnFileThread(locale) |
+ : GetLocalPrinterCapabilitiesOnFileThread(printer_name)); |
if (!printer_capabilities) { |
BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, |
base::Bind(failure_cb, printer_name)); |
return; |
} |
- scoped_ptr<base::DictionaryValue> printer_info(new base::DictionaryValue); |
+ std::unique_ptr<base::DictionaryValue> printer_info( |
+ new base::DictionaryValue); |
printer_info->SetString(kPrinterId, printer_name); |
printer_info->Set(kPrinterCapabilities, printer_capabilities.release()); |
@@ -564,7 +566,7 @@ class PrintPreviewHandler::AccessTokenService |
if (service) { |
OAuth2TokenService::ScopeSet oauth_scopes; |
oauth_scopes.insert(cloud_devices::kCloudPrintAuthScope); |
- scoped_ptr<OAuth2TokenService::Request> request( |
+ std::unique_ptr<OAuth2TokenService::Request> request( |
service->StartRequest(account_id, oauth_scopes, this)); |
requests_[type].reset(request.release()); |
} else { |
@@ -597,7 +599,7 @@ class PrintPreviewHandler::AccessTokenService |
} |
using Requests = |
- std::map<std::string, scoped_ptr<OAuth2TokenService::Request>>; |
+ std::map<std::string, std::unique_ptr<OAuth2TokenService::Request>>; |
Requests requests_; |
PrintPreviewHandler* handler_; |
@@ -792,7 +794,7 @@ void PrintPreviewHandler::HandleGetExtensionPrinterCapabilities( |
void PrintPreviewHandler::HandleGetPreview(const base::ListValue* args) { |
DCHECK_EQ(3U, args->GetSize()); |
- scoped_ptr<base::DictionaryValue> settings = GetSettingsDictionary(args); |
+ std::unique_ptr<base::DictionaryValue> settings = GetSettingsDictionary(args); |
if (!settings) |
return; |
int request_id = -1; |
@@ -888,7 +890,7 @@ void PrintPreviewHandler::HandlePrint(const base::ListValue* args) { |
UMA_HISTOGRAM_COUNTS("PrintPreview.RegeneratePreviewRequest.BeforePrint", |
regenerate_preview_request_count_); |
- scoped_ptr<base::DictionaryValue> settings = GetSettingsDictionary(args); |
+ std::unique_ptr<base::DictionaryValue> settings = GetSettingsDictionary(args); |
if (!settings) |
return; |
@@ -1558,7 +1560,7 @@ void PrintPreviewHandler::LocalPrinterCacheFlushed() { |
} |
void PrintPreviewHandler::PrivetCapabilitiesUpdateClient( |
- scoped_ptr<cloud_print::PrivetHTTPClient> http_client) { |
+ std::unique_ptr<cloud_print::PrivetHTTPClient> http_client) { |
if (!PrivetUpdateClient(std::move(http_client))) |
return; |
@@ -1570,7 +1572,7 @@ void PrintPreviewHandler::PrivetCapabilitiesUpdateClient( |
} |
bool PrintPreviewHandler::PrivetUpdateClient( |
- scoped_ptr<cloud_print::PrivetHTTPClient> http_client) { |
+ std::unique_ptr<cloud_print::PrivetHTTPClient> http_client) { |
if (!http_client) { |
SendPrivetCapabilitiesError(privet_http_resolution_->GetName()); |
privet_http_resolution_.reset(); |
@@ -1591,7 +1593,7 @@ void PrintPreviewHandler::PrivetLocalPrintUpdateClient( |
std::string print_ticket, |
std::string capabilities, |
gfx::Size page_size, |
- scoped_ptr<cloud_print::PrivetHTTPClient> http_client) { |
+ std::unique_ptr<cloud_print::PrivetHTTPClient> http_client) { |
if (!PrivetUpdateClient(std::move(http_client))) |
return; |