DOMUI prefs: Fix a race condition in pushing search engine information to DOMUI

chrome/browser/dom_ui/search_engine_manager_handler.cc

Index: chrome/browser/dom_ui/search_engine_manager_handler.cc
diff --git a/chrome/browser/dom_ui/search_engine_manager_handler.cc b/chrome/browser/dom_ui/search_engine_manager_handler.cc
index 18b8ab07448a0cbffedb46690fbaed3462851301..051568a712086c2413c237830224a1a9a1ad683d 100644
--- a/chrome/browser/dom_ui/search_engine_manager_handler.cc
+++ b/chrome/browser/dom_ui/search_engine_manager_handler.cc
@@ -26,7 +26,10 @@ SearchEngineManagerHandler::~SearchEngineManagerHandler() {
 
 void SearchEngineManagerHandler::Initialize() {
   controller_.reset(new KeywordEditorController(dom_ui_->GetProfile()));
-  controller_->table_model()->SetObserver(this);
+  if (controller_.get()) {
+    controller_->table_model()->SetObserver(this);
+    OnModelChanged();
+  }
 }
 
 void SearchEngineManagerHandler::GetLocalizedValues(
@@ -59,6 +62,9 @@ void SearchEngineManagerHandler::RegisterMessages() {
 }
 
 void SearchEngineManagerHandler::OnModelChanged() {
+  if (!controller_->loaded())
+    return;
+
   ListValue engine_list;
 
   // Find the default engine.