Split mode incognito extension can get misleading pref changed events from regular mode

chrome/browser/extensions/extension_pref_value_map.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/extension_pref_value_map.h"
 
 #include "base/stl_util.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/pref_value_map.h"
 
@@ skipping 92 matching lines @@
     const std::string& extension_id,
     const std::string& pref_key,
     bool incognito) const {
   ExtensionEntryMap::const_iterator winner =
       GetEffectivePrefValueController(pref_key, incognito, NULL);
   if (winner == entries_.end())
     return false;
   return winner->first == extension_id;
 }
 
+bool ExtensionPrefValueMap::DoesExtensionControlIncognitoPref(

[Bernhard Bauer, 2012/06/19 01:12:56]

This method is very similar to the previous one. It might make sense to merge
them, returning the |from_incognito| value via a bool* outparam, and having
callers do the check from line 121 themselves.

You could also leave out the |incognito| parameter then, only looking at
incognito preferences if the passed in bool* is non-NULL.

[mitchellwrosen, 2012/06/20 18:28:26]

Done.

+    const std::string& extension_id,
+    const std::string& pref_key) const {
+  bool from_incognito = false;
+  ExtensionEntryMap::const_iterator winner =
+      GetEffectivePrefValueController(pref_key, true, &from_incognito);
+  if (winner == entries_.end())
+    return false;
+  return from_incognito && winner->first == extension_id;
+}
+
 void ExtensionPrefValueMap::RegisterExtension(const std::string& ext_id,
                                               const base::Time& install_time,
                                               bool is_enabled) {
   if (entries_.find(ext_id) != entries_.end())
     UnregisterExtension(ext_id);
   entries_[ext_id] = new ExtensionEntry;
   entries_[ext_id]->install_time = install_time;
   entries_[ext_id]->enabled = is_enabled;
 }
 
@@ skipping 228 matching lines @@
 
 void ExtensionPrefValueMap::NotifyPrefValueChanged(const std::string& key) {
   FOR_EACH_OBSERVER(ExtensionPrefValueMap::Observer, observers_,
                     OnPrefValueChanged(key));
 }
 
 void ExtensionPrefValueMap::NotifyOfDestruction() {
   FOR_EACH_OBSERVER(ExtensionPrefValueMap::Observer, observers_,
                     OnExtensionPrefValueMapDestruction());
 }