chrome/browser/chromeos/file_system_provider/operations/remove_watcher_unittest.cc - Issue 1870793002: Convert //chrome/browser/chromeos 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: chrome/browser/chromeos/file_system_provider/operations/remove_watcher_unittest.cc

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase 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 | « chrome/browser/chromeos/file_system_provider/operations/remove_watcher.cc ('k') | chrome/browser/chromeos/file_system_provider/operations/test_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/file_system_provider/operations/remove_watcher_unittest.cc

diff --git a/chrome/browser/chromeos/file_system_provider/operations/remove_watcher_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/remove_watcher_unittest.cc

index 7267670cefb17f01877d957a03b359956989e348..a856b18a775603eb3d61edbb4c400711e55246f4 100644

--- a/chrome/browser/chromeos/file_system_provider/operations/remove_watcher_unittest.cc

+++ b/chrome/browser/chromeos/file_system_provider/operations/remove_watcher_unittest.cc

@@ -4,12 +4,12 @@

#include "chrome/browser/chromeos/file_system_provider/operations/remove_watcher.h"

+#include <memory>

#include <string>

#include <vector>

#include "base/files/file.h"

#include "base/files/file_path.h"

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

#include "chrome/browser/chromeos/file_system_provider/operations/test_util.h"

#include "chrome/browser/chromeos/file_system_provider/provided_file_system_interface.h"

#include "chrome/common/extensions/api/file_system_provider.h"

@@ -110,7 +110,7 @@ TEST_F(FileSystemProviderOperationsRemoveWatcherTest, OnSuccess) {

EXPECT_TRUE(remove_watcher.Execute(kRequestId));

remove_watcher.OnSuccess(kRequestId,

- scoped_ptr<RequestValue>(new RequestValue()),

+ std::unique_ptr<RequestValue>(new RequestValue()),

false /* has_more */);

ASSERT_EQ(1u, callback_log.size());

EXPECT_EQ(base::File::FILE_OK, callback_log[0]);

@@ -130,7 +130,7 @@ TEST_F(FileSystemProviderOperationsRemoveWatcherTest, OnError) {

EXPECT_TRUE(remove_watcher.Execute(kRequestId));

remove_watcher.OnError(kRequestId,

- scoped_ptr<RequestValue>(new RequestValue()),

+ std::unique_ptr<RequestValue>(new RequestValue()),

base::File::FILE_ERROR_TOO_MANY_OPENED);

ASSERT_EQ(1u, callback_log.size());

EXPECT_EQ(base::File::FILE_ERROR_TOO_MANY_OPENED, callback_log[0]);