Prevent double inialization of DOMUI pref handlers

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 117 matching lines @@
     const UserMetricsAction& action) {
   UserMetrics::RecordAction(action, dom_ui_->GetProfile());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // OptionsUI
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-OptionsUI::OptionsUI(TabContents* contents) : DOMUI(contents) {
+OptionsUI::OptionsUI(TabContents* contents)
+    : DOMUI(contents), initialized_handlers_(false) {
   DictionaryValue* localized_strings = new DictionaryValue();
 
 #if defined(OS_CHROMEOS)
   AddOptionsPageUIHandler(localized_strings,
                           new chromeos::CoreChromeOSOptionsHandler());
 #else
   AddOptionsPageUIHandler(localized_strings, new CoreOptionsHandler());
 #endif
 
   AddOptionsPageUIHandler(localized_strings, new AddStartupPageHandler());
@@ skipping 102 matching lines @@
 
 // static
 RefCountedMemory* OptionsUI::GetFaviconResourceBytes() {
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytes(IDR_SETTINGS_FAVICON);
 }
 
 void OptionsUI::InitializeHandlers() {
   DCHECK(!GetProfile()->IsOffTheRecord());
 
+  // The reinitialize call from DidBecomeActiveForReusedRenderView end up being
+  // delivered after a new web page DOM has been brought up in an existing
+  // renderer (due to IPC delays), causing this method to be called twice. If
+  // that happens, ignore the second call.
+  if (initialized_handlers_)
+    return;
+  initialized_handlers_ = true;
+
   std::vector<DOMMessageHandler*>::iterator 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));
   }
 }