Renamed ExtensionIdSet to ExtensionIds

chrome/browser/protector/protected_prefs_watcher.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/protector/protected_prefs_watcher.h"
 
 #include "base/base64.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/stringprintf.h"
@@ skipping 191 matching lines @@
 bool ProtectedPrefsWatcher::UpdateCachedPrefs() {
   // Direct access to the extensions prefs is required becase ExtensionService
   // may not yet have been initialized.
   const base::DictionaryValue* extension_prefs;
   const base::Value* extension_prefs_value =
       profile_->GetPrefs()->GetUserPrefValue(ExtensionPrefs::kExtensionsPref);
   if (!extension_prefs_value ||
       !extension_prefs_value->GetAsDictionary(&extension_prefs)) {
     return false;
   }
-  ExtensionPrefs::ExtensionIdSet extension_ids =
+  ExtensionPrefs::ExtensionIds extension_ids =
       ExtensionPrefs::GetExtensionsFrom(extension_prefs);
   if (extension_ids == cached_extension_ids_)
     return false;
   cached_extension_ids_.swap(extension_ids);
   return true;
 }
 
 bool ProtectedPrefsWatcher::HasBackup() const {
   // TODO(ivankr): as soon as some irreversible change to Preferences happens,
   // add a condition that this change has occured as well (otherwise it's
   // possible to simply clear the "backup" dictionary to make settings
   // unprotected).
   return profile_->GetPrefs()->HasPrefPath(kBackupSignature);
 }
 
 void ProtectedPrefsWatcher::InitBackup() {
   PrefService* prefs = profile_->GetPrefs();
   for (size_t i = 0; i < arraysize(kProtectedPrefNames); ++i) {
     const base::Value* user_value =
         prefs->GetUserPrefValue(kProtectedPrefNames[i]);
     if (user_value)
       prefs->Set(GetBackupNameFor(kProtectedPrefNames[i]).c_str(), *user_value);
   }
   ListPrefUpdate extension_ids_update(prefs, kBackupExtensionsIDs);
   base::ListValue* extension_ids = extension_ids_update.Get();
   extension_ids->Clear();
-  for (ExtensionPrefs::ExtensionIdSet::const_iterator it =
+  for (ExtensionPrefs::ExtensionIds::const_iterator it =
            cached_extension_ids_.begin();
        it != cached_extension_ids_.end(); ++it) {
     extension_ids->Append(base::Value::CreateStringValue(*it));
   }
   prefs->SetInteger(kBackupVersion, kCurrentVersionNumber);
   UpdateBackupSignature();
 }
 
 void ProtectedPrefsWatcher::MigrateOldBackupIfNeeded() {
   PrefService* prefs = profile_->GetPrefs();
@@ skipping 40 matching lines @@
   PrefService* prefs = profile_->GetPrefs();
   const PrefService::Preference* pref = prefs->FindPreference(path.c_str());
   if (path == ExtensionPrefs::kExtensionsPref) {
     // For changes in extension dictionary, do nothing if the IDs list remained
     // the same.
     if (!UpdateCachedPrefs())
       return false;
     ListPrefUpdate extension_ids_update(prefs, kBackupExtensionsIDs);
     base::ListValue* extension_ids = extension_ids_update.Get();
     extension_ids->Clear();
-    for (ExtensionPrefs::ExtensionIdSet::const_iterator it =
+    for (ExtensionPrefs::ExtensionIds::const_iterator it =
              cached_extension_ids_.begin();
          it != cached_extension_ids_.end(); ++it) {
       extension_ids->Append(base::Value::CreateStringValue(*it));
     }
   } else if (!prefs->HasPrefPath(path.c_str())) {
     // Preference has been removed, remove the backup as well.
     prefs->ClearPref(backup_path.c_str());
   } else if (!pref->IsUserControlled()) {
     return false;
   } else {
@@ skipping 77 matching lines @@
         NOTREACHED();
         continue;
       }
       StringAppendStringDictionary(tab, &data);
     }
   }
   return data;
 }
 
 }  // namespace protector