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 84 matching lines @@
   }
 
   KeySet::iterator k;
   for (k = deleted_keys.begin(); k != deleted_keys.end(); ++k)
     NotifyPrefValueChanged(*k);
 }
 
 bool ExtensionPrefValueMap::DoesExtensionControlPref(
     const std::string& extension_id,
     const std::string& pref_key,
-    bool incognito) const {
+    bool* from_incognito) const {
+  bool incognito = (from_incognito != NULL);
   ExtensionEntryMap::const_iterator winner =
-      GetEffectivePrefValueController(pref_key, incognito, NULL);
+      GetEffectivePrefValueController(pref_key, incognito, from_incognito);
   if (winner == entries_.end())
     return false;
   return 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);
@@ skipping 233 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());
 }