Remove CONTENT_SETTINGS_NUM_TYPES (part 5)

components/content_settings/core/browser/content_settings_registry.cc

 // Copyright 2015 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_registry.h"
 
 #include "base/memory/scoped_ptr.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/stl_util.h"
 #include "base/values.h"
 #include "components/content_settings/core/browser/content_settings_utils.h"
 #include "components/content_settings/core/browser/website_settings_registry.h"
 #include "components/content_settings/core/common/content_settings.h"
 
 #if defined(ENABLE_PLUGINS)
 #include "components/content_settings/core/browser/plugins_field_trial.h"
 #endif
 
 namespace content_settings {
@@ skipping 60 matching lines @@
 void ContentSettingsRegistry::ResetForTest() {
   website_settings_registry_->ResetForTest();
   content_settings_info_.clear();
   Init();
 }
 
 ContentSettingsRegistry::~ContentSettingsRegistry() {}
 
 const ContentSettingsInfo* ContentSettingsRegistry::Get(
     ContentSettingsType type) const {
-  DCHECK_GE(type, 0);
-  DCHECK_LT(type, static_cast<int>(content_settings_info_.size()));
-  return content_settings_info_[type];
+  const auto& it = content_settings_info_.find(type);
+  if (it != content_settings_info_.end())
+    return it->second;
+  return nullptr;
 }
 
 void ContentSettingsRegistry::Init() {
-  content_settings_info_.resize(CONTENT_SETTINGS_NUM_TYPES);
-
   // TODO(raymes): This registration code should not have to be in a single
   // location. It should be possible to register a setting from the code
   // associated with it.
 
   // WARNING: The string names of the permissions passed in below are used to
   // generate preference names and should never be changed!
 
   // Content settings (those with allow/block/ask/etc. values).
   Register(CONTENT_SETTINGS_TYPE_COOKIES, "cookies", CONTENT_SETTING_ALLOW,
            WebsiteSettingsInfo::SYNCABLE, WhitelistedForWebUI());
@@ skipping 67 matching lines @@
     WebsiteSettingsInfo::SyncStatus sync_status,
     const std::vector<std::string>& whitelisted_schemes) {
   // Ensure that nothing has been registered yet for the given type.
   DCHECK(!website_settings_registry_->Get(type));
   scoped_ptr<base::Value> default_value(
       new base::FundamentalValue(static_cast<int>(initial_default_value)));
   const WebsiteSettingsInfo* website_settings_info =
       website_settings_registry_->Register(type, name, default_value.Pass(),
                                            sync_status,
                                            WebsiteSettingsInfo::NOT_LOSSY);
-  DCHECK_GE(type, 0);
-  DCHECK_LT(type, static_cast<int>(content_settings_info_.size()));
-  content_settings_info_[type] =
-      new ContentSettingsInfo(website_settings_info, whitelisted_schemes);
+  DCHECK(!ContainsKey(content_settings_info_, type));
+  content_settings_info_.set(
+      type, make_scoped_ptr(new ContentSettingsInfo(website_settings_info,
+                                                    whitelisted_schemes)));
 }
 
 }  // namespace content_settings