Separate handler initialization from page initialization

chrome/browser/ui/webui/options2/search_engine_manager_handler2.cc

Index: chrome/browser/ui/webui/options2/search_engine_manager_handler2.cc
diff --git a/chrome/browser/ui/webui/options2/search_engine_manager_handler2.cc b/chrome/browser/ui/webui/options2/search_engine_manager_handler2.cc
index f62eeb220fc459d43198f02275ccb6299dfc79a6..03aa4be7a7be57ce95b61750c9f3723bff8392d9 100644
--- a/chrome/browser/ui/webui/options2/search_engine_manager_handler2.cc
+++ b/chrome/browser/ui/webui/options2/search_engine_manager_handler2.cc
@@ -44,11 +44,10 @@ SearchEngineManagerHandler::~SearchEngineManagerHandler() {
 void SearchEngineManagerHandler::InitializeHandler() {
   list_controller_.reset(
       new KeywordEditorController(Profile::FromWebUI(web_ui())));
-  DCHECK(list_controller_.get());
-  list_controller_->table_model()->SetObserver(this);
 }
 
 void SearchEngineManagerHandler::InitializePage() {
+  list_controller_->table_model()->SetObserver(this);
   OnModelChanged();
 }
 
@@ -247,10 +246,6 @@ void SearchEngineManagerHandler::EditSearchEngine(const ListValue* args) {
     return;
   }
 
-  // CHECK()s to track down the cause of crbug.com/121741.
-  CHECK(list_controller_.get());
-  CHECK(list_controller_->table_model());
-
   // Allow -1, which means we are adding a new engine.
   if (index < -1 || index >= list_controller_->table_model()->RowCount())
     return;