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

Unified Diff: chrome/browser/chromeos/file_system_provider/registry_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/registry_unittest.cc
diff --git a/chrome/browser/chromeos/file_system_provider/registry_unittest.cc b/chrome/browser/chromeos/file_system_provider/registry_unittest.cc
index 292460d57238ea909adb0031addde34331a6ebd1..f37766d19241badf7b004159aad1e109da88561d 100644
--- a/chrome/browser/chromeos/file_system_provider/registry_unittest.cc
+++ b/chrome/browser/chromeos/file_system_provider/registry_unittest.cc
@@ -4,11 +4,11 @@
#include "chrome/browser/chromeos/file_system_provider/registry.h"
+#include <memory>
#include <string>
#include <vector>
#include "base/files/file_path.h"
-#include "base/memory/scoped_ptr.h"
#include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h"
#include "chrome/common/extensions/api/file_system_provider_capabilities/file_system_provider_capabilities_handler.h"
#include "chrome/common/pref_names.h"
@@ -116,9 +116,9 @@ class FileSystemProviderRegistryTest : public testing::Test {
}
content::TestBrowserThreadBundle thread_bundle_;
- scoped_ptr<TestingProfileManager> profile_manager_;
+ std::unique_ptr<TestingProfileManager> profile_manager_;
TestingProfile* profile_;
- scoped_ptr<RegistryInterface> registry_;
+ std::unique_ptr<RegistryInterface> registry_;
Watcher fake_watcher_;
};
@@ -128,8 +128,8 @@ TEST_F(FileSystemProviderRegistryTest, RestoreFileSystems) {
true /* writable */, true /* supports_notify_tag */,
kOpenedFilesLimit, fake_watcher_);
- scoped_ptr<RegistryInterface::RestoredFileSystems> restored_file_systems =
- registry_->RestoreFileSystems(kExtensionId);
+ std::unique_ptr<RegistryInterface::RestoredFileSystems>
+ restored_file_systems = registry_->RestoreFileSystems(kExtensionId);
ASSERT_EQ(1u, restored_file_systems->size());
const RegistryInterface::RestoredFileSystem& restored_file_system =

Powered by Google App Engine
This is Rietveld 408576698