Landing georgey's CL

chrome/browser/search_engines/edit_search_engine_controller.cc

Index: chrome/browser/search_engines/edit_search_engine_controller.cc
===================================================================
--- chrome/browser/search_engines/edit_search_engine_controller.cc	(revision 31462)
+++ chrome/browser/search_engines/edit_search_engine_controller.cc	(working copy)
@@ -24,7 +24,7 @@
 
 bool EditSearchEngineController::IsTitleValid(
     const std::wstring& title_input) const {
-  return !title_input.empty();
+  return !CollapseWhitespace(title_input, true).empty();
 }
 
 bool EditSearchEngineController::IsURLValid(
@@ -50,10 +50,12 @@
 
 bool EditSearchEngineController::IsKeywordValid(
     const std::wstring& keyword_input) const {
-  if (keyword_input.empty())
-    return true;  // Always allow no keyword.
+  std::wstring keyword_input_trimmed(CollapseWhitespace(keyword_input, true));
+  if (keyword_input_trimmed.empty())
+    return false;  // Do not allow empty keyword.
   const TemplateURL* turl_with_keyword =
-      profile_->GetTemplateURLModel()->GetTemplateURLForKeyword(keyword_input);
+      profile_->GetTemplateURLModel()->GetTemplateURLForKeyword(
+          keyword_input_trimmed);
   return (turl_with_keyword == NULL || turl_with_keyword == template_url_);
 }