Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / supervised_user / supervised_user_registration_utility_unittest.cc

diff --git a/src/chrome/browser/supervised_user/supervised_user_registration_utility_unittest.cc b/src/chrome/browser/supervised_user/supervised_user_registration_utility_unittest.cc
index a3b81f4..2e37027 100644 (file)
--- a/src/chrome/browser/supervised_user/supervised_user_registration_utility_unittest.cc
+++ b/src/chrome/browser/supervised_user/supervised_user_registration_utility_unittest.cc
@@ -46,15 +46,13 @@ const char kSupervisedUserToken[] = "supervisedusertoken";
 class MockChangeProcessor : public SyncChangeProcessor {
  public:
   MockChangeProcessor() {}
-  virtual ~MockChangeProcessor() {}
+  ~MockChangeProcessor() override {}
 
   // SyncChangeProcessor implementation:
-  virtual SyncError ProcessSyncChanges(
-      const tracked_objects::Location& from_here,
-      const SyncChangeList& change_list) OVERRIDE;
+  SyncError ProcessSyncChanges(const tracked_objects::Location& from_here,
+                               const SyncChangeList& change_list) override;
 
-  virtual SyncDataList GetAllSyncData(syncer::ModelType type) const
-      OVERRIDE {
+  SyncDataList GetAllSyncData(syncer::ModelType type) const override {
     return SyncDataList();
   }
 
@@ -75,12 +73,12 @@ class MockSupervisedUserRefreshTokenFetcher
     : public SupervisedUserRefreshTokenFetcher {
  public:
   MockSupervisedUserRefreshTokenFetcher() {}
-  virtual ~MockSupervisedUserRefreshTokenFetcher() {}
+  ~MockSupervisedUserRefreshTokenFetcher() override {}
 
   // SupervisedUserRefreshTokenFetcher implementation:
-  virtual void Start(const std::string& supervised_user_id,
-                     const std::string& device_name,
-                     const TokenCallback& callback) OVERRIDE {
+  void Start(const std::string& supervised_user_id,
+             const std::string& device_name,
+             const TokenCallback& callback) override {
     GoogleServiceAuthError error(GoogleServiceAuthError::NONE);
     callback.Run(error, kSupervisedUserToken);
   }
@@ -91,9 +89,9 @@ class MockSupervisedUserRefreshTokenFetcher
 class SupervisedUserRegistrationUtilityTest : public ::testing::Test {
  public:
   SupervisedUserRegistrationUtilityTest();
-  virtual ~SupervisedUserRegistrationUtilityTest();
+  ~SupervisedUserRegistrationUtilityTest() override;
 
-  virtual void TearDown() OVERRIDE;
+  void TearDown() override;
 
  protected:
   scoped_ptr<SyncChangeProcessor> CreateChangeProcessor();
@@ -215,11 +213,10 @@ SupervisedUserRegistrationUtilityTest::GetRegistrationUtility() {
 
 void SupervisedUserRegistrationUtilityTest::Acknowledge() {
   SyncChangeList new_changes;
-  const SyncChangeList& changes = change_processor()->changes();
-  for (SyncChangeList::const_iterator it = changes.begin(); it != changes.end();
-       ++it) {
-    EXPECT_EQ(SyncChange::ACTION_ADD, it->change_type());
-    ::sync_pb::EntitySpecifics specifics = it->sync_data().GetSpecifics();
+  for (const SyncChange& sync_change : change_processor()->changes()) {
+    EXPECT_EQ(SyncChange::ACTION_ADD, sync_change.change_type());
+    ::sync_pb::EntitySpecifics specifics =
+        sync_change.sync_data().GetSpecifics();
     EXPECT_FALSE(specifics.managed_user().acknowledged());
     specifics.mutable_managed_user()->set_acknowledged(true);
     new_changes.push_back(