More misc. cleanups to minimize future refactoring diffs.

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 247 matching lines @@
   edit_controller_.reset(new EditSearchEngineController(
       (index == -1) ? NULL : list_controller_->GetTemplateURL(index), this,
       Profile::FromWebUI(web_ui())));
 }
 
 void SearchEngineManagerHandler::OnEditedKeyword(
     const TemplateURL* template_url,
     const string16& title,
     const string16& keyword,
     const std::string& url) {
+  DCHECK(!url.empty());
   if (template_url)
     list_controller_->ModifyTemplateURL(template_url, title, keyword, url);
   else
     list_controller_->AddTemplateURL(title, keyword, url);
   edit_controller_.reset();
 }
 
 void SearchEngineManagerHandler::CheckSearchEngineInfoValidity(
     const ListValue* args)
 {
@@ skipping 36 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