More misc. cleanups to minimize future refactoring diffs.

chrome/browser/ui/search_engines/edit_search_engine_controller.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/search_engines/edit_search_engine_controller.h"
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 58 matching lines @@
   const TemplateURL* turl_with_keyword =
       TemplateURLServiceFactory::GetForProfile(profile_)->
       GetTemplateURLForKeyword(keyword_input_trimmed);
   return (turl_with_keyword == NULL || turl_with_keyword == template_url_);
 }
 
 void EditSearchEngineController::AcceptAddOrEdit(
     const string16& title_input,
     const string16& keyword_input,
     const std::string& url_input) {
+  DCHECK(!keyword_input.empty());
   std::string url_string = GetFixedUpURL(url_input);
   DCHECK(!url_string.empty());
 
   TemplateURLService* template_url_service =
       TemplateURLServiceFactory::GetForProfile(profile_);
   const TemplateURL* existing =
       template_url_service->GetTemplateURLForKeyword(keyword_input);
   if (existing && (!edit_keyword_delegate_ || existing != template_url_)) {
     // An entry may have been added with the same keyword string while the
     // user edited the dialog, either automatically or by the user (if we're
@@ skipping 46 matching lines @@
   std::string expanded_url(t_url.url_ref().ReplaceSearchTerms(ASCIIToUTF16("x"),
       TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));
   url_parse::Parsed parts;
   std::string scheme(URLFixerUpper::SegmentURL(expanded_url, &parts));
   if (!parts.scheme.is_valid())
     url.insert(0, scheme + "://");
 
   return url;
 }