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

chrome/browser/extensions/extension_service.cc

 // Copyright (c) 2011 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_service.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 1708 matching lines @@
 void ExtensionService::CheckForUpdatesSoon() {
   if (updater()) {
     updater()->CheckSoon();
   } else {
     LOG(WARNING) << "CheckForUpdatesSoon() called with auto-update turned off";
   }
 }
 
 namespace {
   bool IsSyncableNone(const Extension& extension) { return false; }
-} // namespace
+}  // namespace
 
 ExtensionService::SyncBundle::SyncBundle()
   : filter(IsSyncableNone),
     sync_processor(NULL) {
 }
 
 ExtensionService::SyncBundle::~SyncBundle() {
 }
 
 bool ExtensionService::SyncBundle::HasExtensionId(const std::string& id) const {
@@ skipping 281 matching lines @@
   bool old_enabled = extension_prefs_->IsIncognitoEnabled(extension_id);
   if (enabled == old_enabled)
     return;
 
   extension_prefs_->SetIsIncognitoEnabled(extension_id, enabled);
 
   // If the extension is enabled (and not terminated), unload and
   // 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);
   }
 
   if (extension)
     SyncExtensionChangeIfNeeded(*extension);
 }
 
 bool ExtensionService::CanCrossIncognito(const Extension* extension) {
   // We allow the extension to see events and data from another profile iff it
   // uses "spanning" behavior and it has incognito access. "split" mode
@@ skipping 960 matching lines @@
 
 ExtensionService::NaClModuleInfoList::iterator
     ExtensionService::FindNaClModule(const GURL& url) {
   for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin();
        iter != nacl_module_list_.end(); ++iter) {
     if (iter->url == url)
       return iter;
   }
   return nacl_module_list_.end();
 }