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

Unified Diff: chrome/browser/chromeos/file_system_provider/operations/add_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
Index: chrome/browser/chromeos/file_system_provider/operations/add_watcher_unittest.cc
diff --git a/chrome/browser/chromeos/file_system_provider/operations/add_watcher_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/add_watcher_unittest.cc
index 5a688d6ed3e50808eb1af4208b21e64dc18825ec..8f7e2529d50664502fa80b42a538347d5f2dbb2b 100644
--- a/chrome/browser/chromeos/file_system_provider/operations/add_watcher_unittest.cc
+++ b/chrome/browser/chromeos/file_system_provider/operations/add_watcher_unittest.cc
@@ -4,12 +4,12 @@
#include "chrome/browser/chromeos/file_system_provider/operations/add_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(FileSystemProviderOperationsAddWatcherTest, OnSuccess) {
EXPECT_TRUE(add_watcher.Execute(kRequestId));
add_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(FileSystemProviderOperationsAddWatcherTest, OnError) {
EXPECT_TRUE(add_watcher.Execute(kRequestId));
add_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]);

Powered by Google App Engine
This is Rietveld 408576698