Cleanup AutocompleteInput and AutocompleteProvider Functions

chrome/browser/autocomplete/autocomplete_provider.h

 // 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.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_PROVIDER_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_PROVIDER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 239 matching lines @@
   // Fixes up user URL input to make it more possible to match against.  Among
   // many other things, this takes care of the following:
   // * Prepending file:// to file URLs
   // * Converting drive letters in file URLs to uppercase
   // * Converting case-insensitive parts of URLs (like the scheme and domain)
   //   to lowercase
   // * Convert spaces to %20s
   // Note that we don't do this in AutocompleteInput's constructor, because if
   // e.g. we convert a Unicode hostname to punycode, other providers will show
   // output that surprises the user ("Search Google for xn--6ca.com").
-  // Returns false if the fixup attempt resulted in an empty string (which
-  // providers generally can't do anything with).
-  static bool FixupUserInput(AutocompleteInput* input);
+  // If fixup fails, this function either returns the empty string or the
+  // original input text, depending on the value of |return_input_on_failure|.
+  static base::string16 FixupUserInput(const AutocompleteInput& input,
+                                       bool return_input_on_failure);

[Mark P, 2014/06/06 18:07:41]

This is awkward.  Why not use two outparams or return a pair? The way this
currently works make it impossible to determine simultaneously whether the
function call succeeded and its return value.  I solidly don't like it.

[Peter Kasting, 2014/06/06 18:29:08]

Switched to returning a pair.

 
   // Trims "http:" and up to two subsequent slashes from |url|.  Returns the
   // number of characters that were trimmed.
   // NOTE: For a view-source: URL, this will trim from after "view-source:" and
   // return 0.
   static size_t TrimHttpPrefix(base::string16* url);
 
   // The profile associated with the AutocompleteProvider.  Reference is not
   // owned by us.
   Profile* profile_;
 
   AutocompleteProviderListener* listener_;
   ACMatches matches_;
   bool done_;
 
   Type type_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AutocompleteProvider);
 };
 
 typedef std::vector<AutocompleteProvider*> ACProviders;
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_PROVIDER_H_