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

Unified Diff: extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc

Issue 1909773002: Convert //extensions/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: extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc
diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc b/extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc
index b0b8feb6befa41a6a92815ae60b7c61eddd2136b..0ba5b8bdbb4e91d6aefd37a7735e1b422f711374 100644
--- a/extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc
+++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc
@@ -4,6 +4,7 @@
#include "extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.h"
+#include "base/memory/ptr_util.h"
#include "base/memory/singleton.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
#include "components/keyed_service/content/browser_context_keyed_service_factory.h"
@@ -109,10 +110,11 @@ MimeHandlerStreamManager* MimeHandlerStreamManager::Get(
return MimeHandlerStreamManagerFactory::GetInstance()->Get(context);
}
-void MimeHandlerStreamManager::AddStream(const std::string& view_id,
- scoped_ptr<StreamContainer> stream,
- int render_process_id,
- int render_frame_id) {
+void MimeHandlerStreamManager::AddStream(
+ const std::string& view_id,
+ std::unique_ptr<StreamContainer> stream,
+ int render_process_id,
+ int render_frame_id) {
streams_by_extension_id_[stream->extension_id()].insert(view_id);
auto result = streams_.insert(
std::make_pair(view_id, make_linked_ptr(stream.release())));
@@ -121,14 +123,14 @@ void MimeHandlerStreamManager::AddStream(const std::string& view_id,
new EmbedderObserver(this, render_process_id, render_frame_id, view_id));
}
-scoped_ptr<StreamContainer> MimeHandlerStreamManager::ReleaseStream(
+std::unique_ptr<StreamContainer> MimeHandlerStreamManager::ReleaseStream(
const std::string& view_id) {
auto stream = streams_.find(view_id);
if (stream == streams_.end())
return nullptr;
- scoped_ptr<StreamContainer> result =
- make_scoped_ptr(stream->second.release());
+ std::unique_ptr<StreamContainer> result =
+ base::WrapUnique(stream->second.release());
streams_by_extension_id_[result->extension_id()].erase(view_id);
streams_.erase(stream);
embedder_observers_.erase(view_id);

Powered by Google App Engine
This is Rietveld 408576698