Fix a crash in PageActionImageView when extensions are reloaded due to incognito settings changing.

chrome/browser/extensions/extension_service.cc

Index: chrome/browser/extensions/extension_service.cc
===================================================================
--- chrome/browser/extensions/extension_service.cc	(revision 106057)
+++ chrome/browser/extensions/extension_service.cc	(working copy)
@@ -1726,7 +1726,7 @@
 
 namespace {
   bool IsSyncableNone(const Extension& extension) { return false; }
-} // namespace
+}  // namespace
 
 ExtensionService::SyncBundle::SyncBundle()
   : filter(IsSyncableNone),
@@ -2028,8 +2028,13 @@
   // reload it to update UI.
   const Extension* enabled_extension = GetExtensionById(extension_id, false);
   if (enabled_extension) {
+    ExtensionList::iterator iter = std::find(extensions_.begin(),

[Aaron Boodman, 2011/10/20 15:21:49]

Can we just call ReloadExtension() instead? That is what SetFileAccessAllowed()
(below) does, which is similar.

[Matt Perry, 2011/10/24 18:48:56]

Honestly, I don't know. I didn't realize the two used different tactics. Only
option is to try it and see what breaks. There could be some system that depends
on it being done this way.

+                                             extensions_.end(),
+                                             enabled_extension);
+    extensions_.erase(iter);
     NotifyExtensionUnloaded(
         enabled_extension, extension_misc::UNLOAD_REASON_DISABLE);
+    extensions_.push_back(make_scoped_refptr(enabled_extension));
     NotifyExtensionLoaded(enabled_extension);
   }