| Index: chrome/browser/extensions/api/streams_private/streams_private_api.cc
|
| diff --git a/chrome/browser/extensions/api/streams_private/streams_private_api.cc b/chrome/browser/extensions/api/streams_private/streams_private_api.cc
|
| index d222b75ee349fe10f18155e0d5276bb304849796..3f955600ceca503303751d829f59d48beefa34c4 100644
|
| --- a/chrome/browser/extensions/api/streams_private/streams_private_api.cc
|
| +++ b/chrome/browser/extensions/api/streams_private/streams_private_api.cc
|
| @@ -5,6 +5,7 @@
|
| #include "chrome/browser/extensions/api/streams_private/streams_private_api.h"
|
|
|
| #include <limits.h>
|
| +#include <utility>
|
|
|
| #include "base/lazy_instance.h"
|
| #include "base/values.h"
|
| @@ -86,9 +87,9 @@ void StreamsPrivateAPI::ExecuteMimeTypeHandler(
|
| handler->handler_url());
|
| auto tab_id = ExtensionTabUtil::GetTabId(web_contents);
|
| scoped_ptr<StreamContainer> stream_container(new StreamContainer(
|
| - stream.Pass(), tab_id, embedded, handler_url, extension_id));
|
| + std::move(stream), tab_id, embedded, handler_url, extension_id));
|
| MimeHandlerStreamManager::Get(browser_context_)
|
| - ->AddStream(view_id, stream_container.Pass(), render_process_id,
|
| + ->AddStream(view_id, std::move(stream_container), render_process_id,
|
| render_frame_id);
|
| return;
|
| }
|
| @@ -118,7 +119,7 @@ void StreamsPrivateAPI::ExecuteMimeTypeHandler(
|
| streams_private::OnExecuteMimeTypeHandler::Create(info)));
|
|
|
| EventRouter::Get(browser_context_)
|
| - ->DispatchEventToExtension(extension_id, event.Pass());
|
| + ->DispatchEventToExtension(extension_id, std::move(event));
|
|
|
| GURL url = stream->handle->GetURL();
|
| streams_[extension_id][url] = make_linked_ptr(stream->handle.release());
|
|
|