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

Unified Diff: content/child/webblobregistry_impl.cc

Issue 1851933002: Convert //url to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: IWYU fixup 7 Created 4 years, 9 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
« no previous file with comments | « content/child/webblobregistry_impl.h ('k') | content/public/browser/navigation_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/webblobregistry_impl.cc
diff --git a/content/child/webblobregistry_impl.cc b/content/child/webblobregistry_impl.cc
index 0c33552ec21278b130f75b9c2e363c5c14157344..3850ce57c13f4120dc93b980c784e14c7135d755 100644
--- a/content/child/webblobregistry_impl.cc
+++ b/content/child/webblobregistry_impl.cc
@@ -9,7 +9,6 @@
#include "base/guid.h"
#include "base/location.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/shared_memory.h"
#include "base/message_loop/message_loop.h"
#include "base/numerics/safe_conversions.h"
@@ -60,7 +59,7 @@ blink::WebBlobRegistry::Builder* WebBlobRegistryImpl::createBuilder(
void WebBlobRegistryImpl::registerBlobData(const blink::WebString& uuid,
const blink::WebBlobData& data) {
TRACE_EVENT0("Blob", "Registry::RegisterBlob");
- scoped_ptr<Builder> builder(createBuilder(uuid, data.contentType()));
+ std::unique_ptr<Builder> builder(createBuilder(uuid, data.contentType()));
// This is temporary until we move to createBuilder() as our blob creation
// method.
@@ -148,7 +147,7 @@ void WebBlobRegistryImpl::addDataToStream(const WebURL& url,
// writing it directly to the IPC channel.
size_t shared_memory_size =
std::min(length, storage::kBlobStorageMaxSharedMemoryBytes);
- scoped_ptr<base::SharedMemory> shared_memory(
+ std::unique_ptr<base::SharedMemory> shared_memory(
ChildThreadImpl::AllocateSharedMemory(shared_memory_size,
sender_.get()));
CHECK(shared_memory.get());
@@ -247,7 +246,7 @@ void WebBlobRegistryImpl::BuilderImpl::build() {
/* static */
void WebBlobRegistryImpl::StartBlobAsyncConstruction(
const std::string& uuid,
- scoped_ptr<BlobConsolidation> consolidation,
+ std::unique_ptr<BlobConsolidation> consolidation,
scoped_refptr<ThreadSafeSender> sender,
scoped_refptr<base::SingleThreadTaskRunner> main_runner) {
BlobTransportController::GetInstance()->InitiateBlobTransfer(
« no previous file with comments | « content/child/webblobregistry_impl.h ('k') | content/public/browser/navigation_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698