Index: chrome/browser/sync/test/integration/quiesce_status_change_checker.cc |
diff --git a/chrome/browser/sync/test/integration/quiesce_status_change_checker.cc b/chrome/browser/sync/test/integration/quiesce_status_change_checker.cc |
index 096e9dad06e667ad62596d81fda2b3fac0a4e042..fb4265239f100077f9b4a42a2e1a115e88e553d2 100644 |
--- a/chrome/browser/sync/test/integration/quiesce_status_change_checker.cc |
+++ b/chrome/browser/sync/test/integration/quiesce_status_change_checker.cc |
@@ -7,6 +7,7 @@ |
#include <stddef.h> |
#include "base/format_macros.h" |
+#include "base/memory/ptr_util.h" |
#include "base/scoped_observer.h" |
#include "base/strings/string_number_conversions.h" |
#include "base/strings/stringprintf.h" |
@@ -153,7 +154,8 @@ QuiesceStatusChangeChecker::QuiesceStatusChangeChecker( |
: services_(services) { |
DCHECK_LE(1U, services_.size()); |
for (size_t i = 0; i < services_.size(); ++i) { |
- observers_.push_back(new ProgressMarkerWatcher(services[i], this)); |
+ observers_.push_back( |
+ base::MakeUnique<ProgressMarkerWatcher>(services[i], this)); |
} |
} |
@@ -161,8 +163,7 @@ QuiesceStatusChangeChecker::~QuiesceStatusChangeChecker() {} |
bool QuiesceStatusChangeChecker::IsExitConditionSatisfied() { |
// Check that all progress markers are up to date. |
- for (ScopedVector<ProgressMarkerWatcher>::const_iterator it = |
- observers_.begin(); it != observers_.end(); ++it) { |
+ for (auto it = observers_.begin(); it != observers_.end(); ++it) { |
if ((*it)->IsSyncDisabled()) { |
continue; // Skip disabled services. |
} |