Misc. small cleanups to minimize TemplateURL 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 31 matching lines @@
   if (!template_ref.IsValid())
     return false;
 
   // If this is going to be the default search engine, it must support
   // replacement.
   if (!template_ref.SupportsReplacement() &&
       (template_url_ == TemplateURLServiceFactory::GetForProfile(profile_)->
           GetDefaultSearchProvider()))
     return false;
 
-  // 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.
+  // Replace any search term with a placeholder string and make sure the
+  // resulting URL is valid.
   return GURL(template_ref.ReplaceSearchTerms(TemplateURL(), ASCIIToUTF16("x"),
       TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16())).is_valid();
 }
 
 bool EditSearchEngineController::IsKeywordValid(
     const string16& keyword_input) const {
   string16 keyword_input_trimmed(CollapseWhitespace(keyword_input, true));
   if (keyword_input_trimmed.empty())
     return false;  // Do not allow empty keyword.
   const TemplateURL* turl_with_keyword =
@@ skipping 70 matching lines @@
   std::string expanded_url(t_url.url()->ReplaceSearchTerms(t_url,
       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;
 }