Separate handler initialization from page initialization

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

 // Copyright (c) 2012 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/ui/webui/options2/search_engine_manager_handler2.h"
 
 #include "base/bind.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 26 matching lines @@
 }
 
 SearchEngineManagerHandler::~SearchEngineManagerHandler() {
   if (list_controller_.get() && list_controller_->table_model())
     list_controller_->table_model()->SetObserver(NULL);
 }
 
 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();
 }
 
 void SearchEngineManagerHandler::GetLocalizedValues(
     base::DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
   RegisterTitle(localized_strings, "searchEngineManagerPage",
                 IDS_SEARCH_ENGINES_EDITOR_WINDOW_TITLE);
   localized_strings->SetString("defaultSearchEngineListTitle",
@@ skipping 178 matching lines @@
     list_controller_->RemoveTemplateURL(index);
 }
 
 void SearchEngineManagerHandler::EditSearchEngine(const ListValue* args) {
   int index;
   if (!ExtractIntegerValue(args, &index)) {
     NOTREACHED();
     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;
 
   edit_controller_.reset(new EditSearchEngineController(
       (index == -1) ? NULL : list_controller_->GetTemplateURL(index), this,
       Profile::FromWebUI(web_ui())));
 }
 
 void SearchEngineManagerHandler::OnEditedKeyword(
@@ skipping 51 matching lines @@
   if (!args->GetString(ENGINE_NAME, &name) ||
       !args->GetString(ENGINE_KEYWORD, &keyword) ||
       !args->GetString(ENGINE_URL, &url)) {
     NOTREACHED();
     return;
   }
   edit_controller_->AcceptAddOrEdit(name, keyword, url);
 }
 
 }  // namespace options2