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

chrome/browser/extensions/extension_pref_value_map.cc

Index: chrome/browser/extensions/extension_pref_value_map.cc
diff --git a/chrome/browser/extensions/extension_pref_value_map.cc b/chrome/browser/extensions/extension_pref_value_map.cc
index 2965471826ee4f19d1599a67b19d5e1ce4cd088b..23512a357849aa81a3d7697622482c630e2e05ac 100644
--- a/chrome/browser/extensions/extension_pref_value_map.cc
+++ b/chrome/browser/extensions/extension_pref_value_map.cc
@@ -110,6 +110,17 @@ bool ExtensionPrefValueMap::DoesExtensionControlPref(
   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) {