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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_SYNC_FILE_SYSTEM_SERVICE_FACTORY_H_ 5 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_SYNC_FILE_SYSTEM_SERVICE_FACTORY_H_
6 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_SYNC_FILE_SYSTEM_SERVICE_FACTORY_H_ 6 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_SYNC_FILE_SYSTEM_SERVICE_FACTORY_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include <memory>
9
9 #include "base/memory/singleton.h" 10 #include "base/memory/singleton.h"
10 #include "components/keyed_service/content/browser_context_keyed_service_factory .h" 11 #include "components/keyed_service/content/browser_context_keyed_service_factory .h"
11 12
12 class Profile; 13 class Profile;
13 14
14 namespace sync_file_system { 15 namespace sync_file_system {
15 16
16 class LocalFileSyncService; 17 class LocalFileSyncService;
17 class RemoteFileSyncService; 18 class RemoteFileSyncService;
18 class SyncFileSystemService; 19 class SyncFileSystemService;
19 20
20 class SyncFileSystemServiceFactory : public BrowserContextKeyedServiceFactory { 21 class SyncFileSystemServiceFactory : public BrowserContextKeyedServiceFactory {
21 public: 22 public:
22 static SyncFileSystemService* GetForProfile(Profile* profile); 23 static SyncFileSystemService* GetForProfile(Profile* profile);
23 static SyncFileSystemService* FindForProfile(Profile* profile); 24 static SyncFileSystemService* FindForProfile(Profile* profile);
24 static SyncFileSystemServiceFactory* GetInstance(); 25 static SyncFileSystemServiceFactory* GetInstance();
25 26
26 // This overrides the local/remote service for testing. 27 // This overrides the local/remote service for testing.
27 // For testing this must be called before GetForProfile is called. 28 // For testing this must be called before GetForProfile is called.
28 // Otherwise a new DriveFileSyncService is created for the new service. 29 // Otherwise a new DriveFileSyncService is created for the new service.
29 // Since we use scoped_ptr it's one-off and the instance is passed 30 // Since we use std::unique_ptr it's one-off and the instance is passed
30 // to the newly created SyncFileSystemService. 31 // to the newly created SyncFileSystemService.
31 void set_mock_local_file_service( 32 void set_mock_local_file_service(
32 scoped_ptr<LocalFileSyncService> mock_local_service); 33 std::unique_ptr<LocalFileSyncService> mock_local_service);
33 void set_mock_remote_file_service( 34 void set_mock_remote_file_service(
34 scoped_ptr<RemoteFileSyncService> mock_remote_service); 35 std::unique_ptr<RemoteFileSyncService> mock_remote_service);
35 36
36 private: 37 private:
37 friend struct base::DefaultSingletonTraits<SyncFileSystemServiceFactory>; 38 friend struct base::DefaultSingletonTraits<SyncFileSystemServiceFactory>;
38 SyncFileSystemServiceFactory(); 39 SyncFileSystemServiceFactory();
39 ~SyncFileSystemServiceFactory() override; 40 ~SyncFileSystemServiceFactory() override;
40 41
41 // BrowserContextKeyedServiceFactory overrides. 42 // BrowserContextKeyedServiceFactory overrides.
42 KeyedService* BuildServiceInstanceFor( 43 KeyedService* BuildServiceInstanceFor(
43 content::BrowserContext* context) const override; 44 content::BrowserContext* context) const override;
44 45
45 mutable scoped_ptr<LocalFileSyncService> mock_local_file_service_; 46 mutable std::unique_ptr<LocalFileSyncService> mock_local_file_service_;
46 mutable scoped_ptr<RemoteFileSyncService> mock_remote_file_service_; 47 mutable std::unique_ptr<RemoteFileSyncService> mock_remote_file_service_;
47 }; 48 };
48 49
49 } // namespace sync_file_system 50 } // namespace sync_file_system
50 51
51 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_SYNC_FILE_SYSTEM_SERVICE_FACTORY_H_ 52 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_SYNC_FILE_SYSTEM_SERVICE_FACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698