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

Side by Side Diff: chrome/browser/sync/test/integration/quiesce_status_change_checker.h

Issue 2767893002: Remove ScopedVector from chrome/browser/. (Closed)
Patch Set: Address comments from zea@ Created 3 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_TEST_INTEGRATION_QUIESCE_STATUS_CHANGE_CHECKER_H_ 5 #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_QUIESCE_STATUS_CHANGE_CHECKER_H_
6 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_QUIESCE_STATUS_CHANGE_CHECKER_H_ 6 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_QUIESCE_STATUS_CHANGE_CHECKER_H_
7 7
8 #include <memory>
8 #include <string> 9 #include <string>
9 #include <vector> 10 #include <vector>
10 11
11 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
12 #include "base/macros.h" 13 #include "base/macros.h"
13 #include "base/memory/scoped_vector.h"
14 #include "base/time/time.h" 14 #include "base/time/time.h"
15 #include "chrome/browser/sync/test/integration/status_change_checker.h" 15 #include "chrome/browser/sync/test/integration/status_change_checker.h"
16 16
17 class ProgressMarkerWatcher; 17 class ProgressMarkerWatcher;
18 18
19 namespace browser_sync { 19 namespace browser_sync {
20 class ProfileSyncService; 20 class ProfileSyncService;
21 } // namespace browser_sync 21 } // namespace browser_sync
22 22
23 // Waits until all provided clients have finished committing any unsynced items 23 // Waits until all provided clients have finished committing any unsynced items
(...skipping 16 matching lines...) Expand all
40 40
41 // A callback function for some helper objects. 41 // A callback function for some helper objects.
42 void OnServiceStateChanged(browser_sync::ProfileSyncService* service); 42 void OnServiceStateChanged(browser_sync::ProfileSyncService* service);
43 43
44 // Implementation of StatusChangeChecker. 44 // Implementation of StatusChangeChecker.
45 bool IsExitConditionSatisfied() override; 45 bool IsExitConditionSatisfied() override;
46 std::string GetDebugMessage() const override; 46 std::string GetDebugMessage() const override;
47 47
48 private: 48 private:
49 std::vector<browser_sync::ProfileSyncService*> services_; 49 std::vector<browser_sync::ProfileSyncService*> services_;
50 ScopedVector<ProgressMarkerWatcher> observers_; 50 std::vector<std::unique_ptr<ProgressMarkerWatcher>> observers_;
51 51
52 DISALLOW_COPY_AND_ASSIGN(QuiesceStatusChangeChecker); 52 DISALLOW_COPY_AND_ASSIGN(QuiesceStatusChangeChecker);
53 }; 53 };
54 54
55 #endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_QUIESCE_STATUS_CHANGE_CHECKER_H_ 55 #endif // CHROME_BROWSER_SYNC_TEST_INTEGRATION_QUIESCE_STATUS_CHANGE_CHECKER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698