Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(145)

Unified Diff: content/browser/webui/url_data_manager_backend.cc

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/webui/url_data_manager_backend.cc
diff --git a/content/browser/webui/url_data_manager_backend.cc b/content/browser/webui/url_data_manager_backend.cc
index 7dfd7575996376089c08697e5fe25be71a62e6dd..0e5ee0c415c1060e202ac128f8c67829c60daab8 100644
--- a/content/browser/webui/url_data_manager_backend.cc
+++ b/content/browser/webui/url_data_manager_backend.cc
@@ -13,6 +13,7 @@
#include "base/lazy_instance.h"
#include "base/location.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
#include "base/memory/ref_counted_memory.h"
#include "base/memory/weak_ptr.h"
@@ -45,7 +46,6 @@
#include "net/url_request/url_request_error_job.h"
#include "net/url_request/url_request_job.h"
#include "net/url_request/url_request_job_factory.h"
-
#include "url/url_util.h"
namespace content {
@@ -458,7 +458,7 @@ void GetMimeTypeOnUI(URLDataSourceImpl* source,
namespace {
bool IsValidNetworkErrorCode(int error_code) {
- scoped_ptr<base::DictionaryValue> error_codes = net::GetNetConstants();
+ std::unique_ptr<base::DictionaryValue> error_codes = net::GetNetConstants();
const base::DictionaryValue* net_error_codes_dict = nullptr;
for (base::DictionaryValue::Iterator itr(*error_codes); !itr.IsAtEnd();
@@ -573,13 +573,13 @@ URLDataManagerBackend::~URLDataManagerBackend() {
}
// static
-scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
+std::unique_ptr<net::URLRequestJobFactory::ProtocolHandler>
URLDataManagerBackend::CreateProtocolHandler(
content::ResourceContext* resource_context,
bool is_incognito,
ChromeBlobStorageContext* blob_storage_context) {
DCHECK(resource_context);
- return make_scoped_ptr(new ChromeProtocolHandler(
+ return base::WrapUnique(new ChromeProtocolHandler(
resource_context, is_incognito, blob_storage_context));
}
« no previous file with comments | « content/browser/webui/url_data_manager_backend.h ('k') | content/browser/webui/url_data_manager_backend_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698