Index: chrome/browser/extensions/api/sync_file_system/sync_file_system_browsertest.cc |
diff --git a/chrome/browser/extensions/api/sync_file_system/sync_file_system_browsertest.cc b/chrome/browser/extensions/api/sync_file_system/sync_file_system_browsertest.cc |
index b1095e225670467dc2d3e423cc654fa8d1519ce2..9dd2a56b64222f1f369d7da1f47e881152b07d27 100644 |
--- a/chrome/browser/extensions/api/sync_file_system/sync_file_system_browsertest.cc |
+++ b/chrome/browser/extensions/api/sync_file_system/sync_file_system_browsertest.cc |
@@ -36,11 +36,11 @@ class FakeDriveServiceFactory |
: change_observer_(change_observer) {} |
~FakeDriveServiceFactory() override {} |
- scoped_ptr<drive::DriveServiceInterface> CreateDriveService( |
+ std::unique_ptr<drive::DriveServiceInterface> CreateDriveService( |
OAuth2TokenService* oauth2_token_service, |
net::URLRequestContextGetter* url_request_context_getter, |
base::SequencedTaskRunner* blocking_task_runner) override { |
- scoped_ptr<drive::FakeDriveService> drive_service( |
+ std::unique_ptr<drive::FakeDriveService> drive_service( |
new drive::FakeDriveService); |
drive_service->AddChangeObserver(change_observer_); |
return std::move(drive_service); |
@@ -93,7 +93,7 @@ class SyncFileSystemTest : public extensions::PlatformAppBrowserTest, |
ExtensionServiceInterface* extension_service = |
extensions::ExtensionSystem::Get(context)->extension_service(); |
- scoped_ptr<drive_backend::SyncEngine::DriveServiceFactory> |
+ std::unique_ptr<drive_backend::SyncEngine::DriveServiceFactory> |
drive_service_factory(new FakeDriveServiceFactory(this)); |
fake_signin_manager_.reset(new FakeSigninManagerForTesting( |
@@ -112,7 +112,7 @@ class SyncFileSystemTest : public extensions::PlatformAppBrowserTest, |
std::move(drive_service_factory), in_memory_env_.get()); |
remote_service_->SetSyncEnabled(true); |
factory->set_mock_remote_file_service( |
- scoped_ptr<RemoteFileSyncService>(remote_service_)); |
+ std::unique_ptr<RemoteFileSyncService>(remote_service_)); |
} |
// drive::FakeDriveService::ChangeObserver override. |
@@ -150,9 +150,9 @@ class SyncFileSystemTest : public extensions::PlatformAppBrowserTest, |
private: |
base::ScopedTempDir base_dir_; |
- scoped_ptr<leveldb::Env> in_memory_env_; |
+ std::unique_ptr<leveldb::Env> in_memory_env_; |
- scoped_ptr<FakeSigninManagerForTesting> fake_signin_manager_; |
+ std::unique_ptr<FakeSigninManagerForTesting> fake_signin_manager_; |
drive_backend::SyncEngine* remote_service_; |