Hoist TrimHttpPrefix() so we only have one copy, not one per provider....

chrome/browser/autocomplete/history_url_provider.cc

 // Copyright (c) 2006-2008 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/autocomplete/history_url_provider.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/histogram.h"
@@ skipping 354 matching lines @@
     const url_parse::Parsed& parts =
         canonical_gurl.parsed_for_possibly_invalid_spec();
     // parts.host must not be empty when HostIsIPAddress() is true.
     DCHECK(parts.host.is_nonempty());
     canonical_gurl_str.replace(parts.host.begin, parts.host.len,
                                original_hostname);
   }
   std::wstring output(UTF8ToWide(canonical_gurl_str));
   // Don't prepend a scheme when the user didn't have one.  Since the fixer
   // upper only prepends the "http" scheme, that's all we need to check for.
-  url_parse::Component scheme;
   if (canonical_gurl.SchemeIs(chrome::kHttpScheme) &&
       !url_util::FindAndCompareScheme(WideToUTF8(input_text),
-                                      chrome::kHttpScheme, &scheme))
+                                      chrome::kHttpScheme, NULL))
     TrimHttpPrefix(&output);
 
   // Make the number of trailing slashes on the output exactly match the input.
   // Examples of why not doing this would matter:
   // * The user types "a" and has this fixed up to "a/".  Now no other sites
   //   beginning with "a" will match.
   // * The user types "file:" and has this fixed up to "file://".  Now inline
   //   autocomplete will append too few slashes, resulting in e.g. "file:/b..."
   //   instead of "file:///b..."
   // * The user types "http:/" and has this fixed up to "http:".  Now inline
@@ skipping 12 matching lines @@
       output.length() : (output.length() - 1 - last_output_nonslash);
   if (num_output_slashes < num_input_slashes)
     output.append(num_input_slashes - num_output_slashes, '/');
   else if (num_output_slashes > num_input_slashes)
     output.erase(output.length() - num_output_slashes + num_input_slashes);
 
   return output;
 }
 
 // static
-size_t HistoryURLProvider::TrimHttpPrefix(std::wstring* url) {
-  url_parse::Component scheme;
-  if (!url_util::FindAndCompareScheme(WideToUTF8(*url), chrome::kHttpScheme,
-                                      &scheme))
-    return 0;  // Not "http".
-
-  // Erase scheme plus up to two slashes.
-  size_t prefix_len = scheme.end() + 1;  // "http:"
-  const size_t after_slashes = std::min(url->length(),
-                                        static_cast<size_t>(scheme.end() + 3));
-  while ((prefix_len < after_slashes) && ((*url)[prefix_len] == L'/'))
-    ++prefix_len;
-  if (prefix_len == url->length())
-    url->clear();
-  else
-    url->erase(url->begin(), url->begin() + prefix_len);
-  return prefix_len;
-}
-
-// static
 bool HistoryURLProvider::IsHostOnly(const GURL& url) {
   DCHECK(url.is_valid());
   return (!url.has_path() || (url.path() == "/")) && !url.has_query() &&
       !url.has_ref();
 }
 
 // static
 bool HistoryURLProvider::CompareHistoryMatch(const HistoryMatch& a,
                                              const HistoryMatch& b) {
   // A URL that has been typed at all is better than one that has never been
@@ skipping 412 matching lines @@
       history_match.input_location - offset, params->input.text().length(),
       match.contents.length(), ACMatchClassification::URL,
       &match.contents_class);
   match.description = info.title();
   AutocompleteMatch::ClassifyMatchInString(params->input.text(), info.title(),
                                            ACMatchClassification::NONE,
                                            &match.description_class);
 
   return match;
 }