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

Unified Diff: chrome/browser/sync_file_system/sync_file_system_service_factory.h

Issue 1873683002: Convert //chrome/browser/sync_file_system from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/sync_file_system/sync_file_system_service_factory.h
diff --git a/chrome/browser/sync_file_system/sync_file_system_service_factory.h b/chrome/browser/sync_file_system/sync_file_system_service_factory.h
index fa7341c499d3c31f6c9854b5f1197784319b7cfa..240138a454e40ee5c5a1314c880120690e222aa8 100644
--- a/chrome/browser/sync_file_system/sync_file_system_service_factory.h
+++ b/chrome/browser/sync_file_system/sync_file_system_service_factory.h
@@ -5,7 +5,8 @@
#ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_SYNC_FILE_SYSTEM_SERVICE_FACTORY_H_
#define CHROME_BROWSER_SYNC_FILE_SYSTEM_SYNC_FILE_SYSTEM_SERVICE_FACTORY_H_
-#include "base/memory/scoped_ptr.h"
+#include <memory>
+
#include "base/memory/singleton.h"
#include "components/keyed_service/content/browser_context_keyed_service_factory.h"
@@ -26,12 +27,12 @@ class SyncFileSystemServiceFactory : public BrowserContextKeyedServiceFactory {
// This overrides the local/remote service for testing.
// For testing this must be called before GetForProfile is called.
// Otherwise a new DriveFileSyncService is created for the new service.
- // Since we use scoped_ptr it's one-off and the instance is passed
+ // Since we use std::unique_ptr it's one-off and the instance is passed
// to the newly created SyncFileSystemService.
void set_mock_local_file_service(
- scoped_ptr<LocalFileSyncService> mock_local_service);
+ std::unique_ptr<LocalFileSyncService> mock_local_service);
void set_mock_remote_file_service(
- scoped_ptr<RemoteFileSyncService> mock_remote_service);
+ std::unique_ptr<RemoteFileSyncService> mock_remote_service);
private:
friend struct base::DefaultSingletonTraits<SyncFileSystemServiceFactory>;
@@ -42,8 +43,8 @@ class SyncFileSystemServiceFactory : public BrowserContextKeyedServiceFactory {
KeyedService* BuildServiceInstanceFor(
content::BrowserContext* context) const override;
- mutable scoped_ptr<LocalFileSyncService> mock_local_file_service_;
- mutable scoped_ptr<RemoteFileSyncService> mock_remote_file_service_;
+ mutable std::unique_ptr<LocalFileSyncService> mock_local_file_service_;
+ mutable std::unique_ptr<RemoteFileSyncService> mock_remote_file_service_;
};
} // namespace sync_file_system

Powered by Google App Engine
This is Rietveld 408576698