Landing georgey's CL

chrome/browser/search_engines/edit_search_engine_controller.cc

 // Copyright (c) 2009 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/search_engines/edit_search_engine_controller.h"
 
 #include "base/string_util.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "googleurl/src/gurl.h"
 
 EditSearchEngineController::EditSearchEngineController(
     const TemplateURL* template_url,
     EditSearchEngineControllerDelegate* edit_keyword_delegate,
     Profile* profile)
     : template_url_(template_url),
       edit_keyword_delegate_(edit_keyword_delegate),
       profile_(profile) {
   DCHECK(profile_);
 }
 
 bool EditSearchEngineController::IsTitleValid(
     const std::wstring& title_input) const {
-  return !title_input.empty();
+  return !CollapseWhitespace(title_input, true).empty();
 }
 
 bool EditSearchEngineController::IsURLValid(
     const std::wstring& url_input) const {
   std::wstring url = GetFixedUpURL(url_input);
   if (url.empty())
     return false;
 
   // Use TemplateURLRef to extract the search placeholder.
   TemplateURLRef template_ref(url, 0, 0);
   if (!template_ref.IsValid())
     return false;
 
   if (!template_ref.SupportsReplacement())
     return GURL(WideToUTF16Hack(url)).is_valid();
 
   // If the url has a search term, replace it with a random string and make
   // sure the resulting URL is valid. We don't check the validity of the url
   // with the search term as that is not necessarily valid.
   return GURL(WideToUTF8(template_ref.ReplaceSearchTerms(TemplateURL(), L"a",
       TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, std::wstring()))).is_valid();
 }
 
 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_);
 }
 
 void EditSearchEngineController::AcceptAddOrEdit(
     const std::wstring& title_input,
     const std::wstring& keyword_input,
     const std::wstring& url_input) {
   std::wstring url_string = GetFixedUpURL(url_input);
   DCHECK(!url_string.empty());
 
@@ skipping 62 matching lines @@
   std::string scheme(
       URLFixerUpper::SegmentURL(WideToUTF8(expanded_url), &parts));
   if(!parts.scheme.is_valid()) {
     scheme.append("://");
     url.insert(0, UTF8ToWide(scheme));
   }
 
   return url;
 }