Add facility to fix about: and file: links from chrome:// pages.

chrome/browser/dom_ui/options/options_ui.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/dom_ui/options/options_ui.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 196 matching lines @@
           &ChromeURLDataManager::AddDataSource,
           make_scoped_refptr(theme)));
 
   // Initialize the chrome://about/ source in case the user clicks the credits
   // link.
   InitializeAboutDataSource();
 }
 
 OptionsUI::~OptionsUI() {
   // Uninitialize all registered handlers. The base class owns them and it will
-  // eventually delete them.
-  for (std::vector<DOMMessageHandler*>::iterator iter = handlers_.begin();
+  // eventually delete them. Skip over the generic handler.
+  for (std::vector<DOMMessageHandler*>::iterator iter = handlers_.begin() + 1;
        iter != handlers_.end();
        ++iter) {
     static_cast<OptionsPageUIHandler*>(*iter)->Uninitialize();
   }
 }
 
 // Override.
 void OptionsUI::RenderViewCreated(RenderViewHost* render_view_host) {
   std::string command_line_string;
 
@@ skipping 23 matching lines @@
 // static
 RefCountedMemory* OptionsUI::GetFaviconResourceBytes() {
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytes(IDR_SETTINGS_FAVICON);
 }
 
 void OptionsUI::InitializeHandlers() {
   DCHECK(!GetProfile()->IsOffTheRecord());
 
   std::vector<DOMMessageHandler*>::iterator iter;
-  for (iter = handlers_.begin(); iter != handlers_.end(); ++iter) {
+  // Skip over the generic handler.
+  for (iter = handlers_.begin() + 1; iter != handlers_.end(); ++iter) {
     (static_cast<OptionsPageUIHandler*>(*iter))->Initialize();
   }
 }
 
 void OptionsUI::AddOptionsPageUIHandler(DictionaryValue* localized_strings,
                                         OptionsPageUIHandler* handler_raw) {
   scoped_ptr<OptionsPageUIHandler> handler(handler_raw);
   DCHECK(handler.get());
   // Add only if handler's service is enabled.
   if (handler->IsEnabled()) {
     handler->GetLocalizedValues(localized_strings);
     // Add handler to the list and also pass the ownership.
     AddMessageHandler(handler.release()->Attach(this));
   }
 }