Remove CONTENT_SETTINGS_NUM_TYPES (part 5)

chrome/browser/content_settings/content_settings_pref_provider_unittest.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 "components/content_settings/core/browser/content_settings_pref_provider.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 47 matching lines @@
 // A helper for observing an preference changes and testing whether
 // |PrefProvider| holds a lock when the preferences change.
 class DeadlockCheckerObserver {
  public:
   // |DeadlockCheckerObserver| doesn't take the ownership of |prefs| or
   // |provider|.
   DeadlockCheckerObserver(PrefService* prefs, PrefProvider* provider)
       : provider_(provider),
       notification_received_(false) {
     pref_change_registrar_.Init(prefs);
-    for (ContentSettingsPref* pref : provider_->content_settings_prefs_) {
+    for (const auto& pair : provider_->content_settings_prefs_) {
+      const ContentSettingsPref* pref = pair.second;
       pref_change_registrar_.Add(
           pref->pref_name_,
           base::Bind(
               &DeadlockCheckerObserver::OnContentSettingsPatternPairsChanged,
               base::Unretained(this), base::Unretained(pref)));
     }
   }
   virtual ~DeadlockCheckerObserver() {}
 
   bool notification_received() const {
@@ skipping 538 matching lines @@
   for (const char* pref : nonempty_prefs) {
     DictionaryPrefUpdate update(&prefs, pref);
     const base::DictionaryValue* dictionary = update.Get();
     EXPECT_EQ(1u, dictionary->size());
   }
 
   provider.ShutdownOnUIThread();
 }
 
 }  // namespace content_settings