Deleted CONTENT_SETTINGS_TYPE_FULLSCREEN and MOUSELOCK.

chrome/browser/extensions/api/content_settings/content_settings_store.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/extensions/api/content_settings/content_settings_store.h"
 
 #include <memory>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 301 matching lines @@
     std::string secondary_pattern_str;
     dict->GetString(keys::kSecondaryPatternKey, &secondary_pattern_str);
     ContentSettingsPattern secondary_pattern =
         ContentSettingsPattern::FromString(secondary_pattern_str);
     DCHECK(secondary_pattern.IsValid());
 
     std::string content_settings_type_str;
     dict->GetString(keys::kContentSettingsTypeKey, &content_settings_type_str);
     ContentSettingsType content_settings_type =
         helpers::StringToContentSettingsType(content_settings_type_str);
-    if (content_settings_type == CONTENT_SETTINGS_TYPE_FULLSCREEN ||
-        content_settings_type == CONTENT_SETTINGS_TYPE_MOUSELOCK) {
-      // Fullscreen and mouselock are deprecated. Skip over settings of these
-      // types, effectively deleting them from the in-memory model. This will
-      // implicitly delete these old settings from the pref store when it is
-      // written back.
+    if (content_settings_type == CONTENT_SETTINGS_TYPE_DEFAULT) {
+      // We'll end up with DEFAULT here if the type string isn't recognised.
+      // This could be if it's a string from an old settings type that has been
+      // deleted. DCHECK to make sure this is the case (not some random string).
+      DCHECK(content_settings_type_str == "fullscreen" ||
+             content_settings_type_str == "mouselock");
+
+      // In this case, we just skip over that setting, effectively deleting it
+      // from the in-memory model. This will implicitly delete these old
+      // settings from the pref store when it is written back.
       continue;
     }
-    DCHECK_NE(CONTENT_SETTINGS_TYPE_DEFAULT, content_settings_type);
 
     std::string resource_identifier;
     dict->GetString(keys::kResourceIdentifierKey, &resource_identifier);
 
     std::string content_setting_string;
     dict->GetString(keys::kContentSettingKey, &content_setting_string);
     ContentSetting setting;
     bool result = content_settings::ContentSettingFromString(
         content_setting_string, &setting);
     DCHECK(result);
@@ skipping 45 matching lines @@
 ContentSettingsStore::FindEntry(const std::string& ext_id) const {
   ExtensionEntryMap::const_iterator i;
   for (i = entries_.begin(); i != entries_.end(); ++i) {
     if (i->second->id == ext_id)
       return i;
   }
   return entries_.end();
 }
 
 }  // namespace extensions