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

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

Issue 2767893002: Remove ScopedVector from chrome/browser/. (Closed)
Patch Set: Address comments from zea@ Created 3 years, 9 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.h
diff --git a/chrome/browser/sync_file_system/sync_file_system_service.h b/chrome/browser/sync_file_system/sync_file_system_service.h
index d3631e7e5f9e925ad52b3ac9bb03c71e4e2e8b4b..cc42628c93f6b1a757cb60bc2793ffb6697ad855 100644
--- a/chrome/browser/sync_file_system/sync_file_system_service.h
+++ b/chrome/browser/sync_file_system/sync_file_system_service.h
@@ -8,10 +8,10 @@
#include <map>
#include <memory>
#include <string>
+#include <vector>
#include "base/callback_forward.h"
#include "base/macros.h"
-#include "base/memory/scoped_vector.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
#include "chrome/browser/sync_file_system/conflict_resolution_policy.h"
@@ -172,8 +172,8 @@ class SyncFileSystemService
std::unique_ptr<RemoteFileSyncService> remote_service_;
// Holds all SyncProcessRunners.
- ScopedVector<SyncProcessRunner> local_sync_runners_;
- ScopedVector<SyncProcessRunner> remote_sync_runners_;
+ std::vector<std::unique_ptr<SyncProcessRunner>> local_sync_runners_;
+ std::vector<std::unique_ptr<SyncProcessRunner>> remote_sync_runners_;
// Indicates if sync is currently enabled or not.
bool sync_enabled_;

Powered by Google App Engine
This is Rietveld 408576698