More misc. cleanups to minimize future refactoring diffs.

chrome/browser/search_engines/template_url_parser.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/search_engines/template_url_parser.h"
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
@@ skipping 81 matching lines @@
     query->append("=");
   }
   query->append(value);
 }
 
 // Returns true if |url| is empty or is a valid URL with a scheme of HTTP[S].
 bool IsHTTPRef(const std::string& url) {
   if (url.empty())
     return true;
   GURL gurl(url);
-  return (gurl.is_valid() && (gurl.SchemeIs(chrome::kHttpScheme) ||
-                              gurl.SchemeIs(chrome::kHttpsScheme)));
+  return gurl.is_valid() && (gurl.SchemeIs(chrome::kHttpScheme) ||
+                             gurl.SchemeIs(chrome::kHttpsScheme));
 }
 
 }  // namespace
 
 
 // TemplateURLParsingContext --------------------------------------------------
 
 // To minimize memory overhead while parsing, a SAX style parser is used.
 // TemplateURLParsingContext is used to maintain the state we're in the document
 // while parsing.
@@ skipping 191 matching lines @@
   if (derive_image_from_url_ && data_.favicon_url.is_empty())
     data_.favicon_url = TemplateURL::GenerateFaviconURL(url);
 
   // TODO(jcampan): http://b/issue?id=1196285 we do not support search engines
   //                that use POST yet.
   if (method_ == TemplateURLParsingContext::POST)
     return NULL;
   if (suggestion_method_ == TemplateURLParsingContext::POST)
     data_.suggestions_url.clear();
 
-  // Give this a keyword to facilitate tab-to-search.
   string16 keyword(TemplateURLService::GenerateKeyword(url, false));
   DCHECK(!keyword.empty());
   data_.SetKeyword(keyword);
   data_.show_in_default_list = show_in_default_list;
   return new TemplateURL(data_);
 }
 
 // static
 void TemplateURLParsingContext::InitMapping() {
   kElementNameToElementTypeMap = new std::map<std::string, ElementType>;
@@ skipping 163 matching lines @@
   xmlSAXHandler sax_handler;
   memset(&sax_handler, 0, sizeof(sax_handler));
   sax_handler.startElement = &TemplateURLParsingContext::StartElementImpl;
   sax_handler.endElement = &TemplateURLParsingContext::EndElementImpl;
   sax_handler.characters = &TemplateURLParsingContext::CharactersImpl;
   xmlSAXUserParseMemory(&sax_handler, &context, data, static_cast<int>(length));
   xmlSubstituteEntitiesDefault(last_sub_entities_value);
 
   return context.GetTemplateURL(profile, show_in_default_list);
 }