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

Unified Diff: chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc

Issue 1871713002: Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and fix header 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/extensions/api/file_system/file_system_apitest_chromeos.cc
diff --git a/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc b/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc
index d56001d0ad34aac2fe1ee440b1f6fc0620a9708e..aea16aa328ed4b70bf2db56c7cd61ca8a23814d6 100644
--- a/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc
+++ b/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc
@@ -129,7 +129,7 @@ class FileSystemApiTestForDrive : public PlatformAppBrowserTest {
void SetUpOnMainThread() override {
PlatformAppBrowserTest::SetUpOnMainThread();
- scoped_ptr<drive::ResourceEntry> entry;
+ std::unique_ptr<drive::ResourceEntry> entry;
drive::FileError error = drive::FILE_ERROR_FAILED;
integration_service_->file_system()->GetResourceEntry(
base::FilePath::FromUTF8Unsafe("drive/root"), // whatever
@@ -178,7 +178,7 @@ class FileSystemApiTestForDrive : public PlatformAppBrowserTest {
bool AddTestFile(const std::string& title,
const std::string& data,
const std::string& parent_id) {
- scoped_ptr<google_apis::FileResource> entry;
+ std::unique_ptr<google_apis::FileResource> entry;
google_apis::DriveApiErrorCode error = google_apis::DRIVE_OTHER_ERROR;
fake_drive_service_->AddNewFile(
"text/plain", data, parent_id, title, false,
@@ -189,7 +189,7 @@ class FileSystemApiTestForDrive : public PlatformAppBrowserTest {
std::string AddTestDirectory(const std::string& title,
const std::string& parent_id) {
- scoped_ptr<google_apis::FileResource> entry;
+ std::unique_ptr<google_apis::FileResource> entry;
google_apis::DriveApiErrorCode error = google_apis::DRIVE_OTHER_ERROR;
fake_drive_service_->AddNewDirectory(
parent_id, title, drive::AddNewDirectoryOptions(),
@@ -203,7 +203,7 @@ class FileSystemApiTestForDrive : public PlatformAppBrowserTest {
drive::DriveIntegrationService* integration_service_;
drive::DriveIntegrationServiceFactory::FactoryCallback
create_drive_integration_service_;
- scoped_ptr<drive::DriveIntegrationServiceFactory::ScopedFactoryForTest>
+ std::unique_ptr<drive::DriveIntegrationServiceFactory::ScopedFactoryForTest>
service_factory_for_test_;
};
@@ -238,7 +238,7 @@ class FileSystemApiTestForRequestFileSystem : public PlatformAppBrowserTest {
protected:
base::ScopedTempDir temp_dir_;
chromeos::FakeChromeUserManager* fake_user_manager_;
- scoped_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
+ std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
// Creates a testing file system in a testing directory.
void CreateTestingFileSystem(const std::string& mount_point_name,

Powered by Google App Engine
This is Rietveld 408576698