extensions/browser/api/mime_handler_private/mime_handler_private_unittest.cc - Issue 1902873002: Convert //extensions/browser/api from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: extensions/browser/api/mime_handler_private/mime_handler_private_unittest.cc

Issue 1902873002: Convert //extensions/browser/api 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

« no previous file with comments | « extensions/browser/api/messaging/native_messaging_channel.h ('k') | extensions/browser/api/networking_config/networking_config_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/browser/api/mime_handler_private/mime_handler_private_unittest.cc

diff --git a/extensions/browser/api/mime_handler_private/mime_handler_private_unittest.cc b/extensions/browser/api/mime_handler_private/mime_handler_private_unittest.cc

index d88335890b7921577b132831cbb448761e330df3..d8e1035097b536a1481d3c5247d7c312c75889e4 100644

--- a/extensions/browser/api/mime_handler_private/mime_handler_private_unittest.cc

+++ b/extensions/browser/api/mime_handler_private/mime_handler_private_unittest.cc

@@ -4,9 +4,10 @@

#include "extensions/browser/api/mime_handler_private/mime_handler_private.h"

+#include <memory>

#include <utility>

-#include "base/memory/scoped_ptr.h"

+#include "base/memory/ptr_util.h"

#include "base/message_loop/message_loop.h"

#include "content/public/browser/stream_handle.h"

#include "content/public/browser/stream_info.h"

@@ -40,8 +41,8 @@ class TestStreamHandle : public content::StreamHandle {

class MimeHandlerServiceImplTest : public testing::Test {

public:

void SetUp() override {

- scoped_ptr<content::StreamInfo> stream_info(new content::StreamInfo);

- stream_info->handle = make_scoped_ptr(new TestStreamHandle);

+ std::unique_ptr<content::StreamInfo> stream_info(new content::StreamInfo);

+ stream_info->handle = base::WrapUnique(new TestStreamHandle);

stream_info->mime_type = "test/unit";

stream_info->original_url = GURL("test://extensions_unittests");

stream_container_.reset(

@@ -60,9 +61,9 @@ class MimeHandlerServiceImplTest : public testing::Test {

}

base::MessageLoop message_loop_;

- scoped_ptr<StreamContainer> stream_container_;

+ std::unique_ptr<StreamContainer> stream_container_;

mime_handler::MimeHandlerServicePtr service_ptr_;

- scoped_ptr<mime_handler::MimeHandlerService> service_;

+ std::unique_ptr<mime_handler::MimeHandlerService> service_;

bool abort_called_ = false;

mime_handler::StreamInfoPtr stream_info_;

};