Don't clear existing extension-defined preferences and content settings when reloading or updating…

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 <set>
 
 #include "base/debug/alias.h"
 #include "base/logging.h"
@@ skipping 105 matching lines @@
   NotifyOfContentSettingChanged(ext_id,
                                 scope != kExtensionPrefsScopeRegular);
 }
 
 void ContentSettingsStore::RegisterExtension(
     const std::string& ext_id,
     const base::Time& install_time,
     bool is_enabled) {
   base::AutoLock lock(lock_);
   ExtensionEntryMap::iterator i = FindEntry(ext_id);
-  if (i != entries_.end()) {
-    delete i->second;
-    entries_.erase(i);
-  }
+  if (i != entries_.end())
+    return;
 
   ExtensionEntry* entry = new ExtensionEntry;
   entry->id = ext_id;
   entry->enabled = is_enabled;

[Jeffrey Yasskin, 2013/09/06 21:31:56]

Similarly here, do we need to update |enabled| or DCHECK it?

[Bernhard Bauer, 2013/09/10 13:28:18]

DCHECKed.

   entries_.insert(std::make_pair(install_time, entry));
 }
 
 void ContentSettingsStore::UnregisterExtension(
     const std::string& ext_id) {
   bool notify = false;
   bool notify_incognito = false;
   {
     base::AutoLock lock(lock_);
     ExtensionEntryMap::iterator i = FindEntry(ext_id);
@@ skipping 223 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