Cleanup AutocompleteInput and AutocompleteProvider Functions

chrome/browser/autocomplete/autocomplete_provider.h

Index: chrome/browser/autocomplete/autocomplete_provider.h
diff --git a/chrome/browser/autocomplete/autocomplete_provider.h b/chrome/browser/autocomplete/autocomplete_provider.h
index 02e247e062221111c856b60afcda909ef2b6744d..e1892f70065ec2f30f696809bb35c4c140fbb19c 100644
--- a/chrome/browser/autocomplete/autocomplete_provider.h
+++ b/chrome/browser/autocomplete/autocomplete_provider.h
@@ -257,9 +257,10 @@ class AutocompleteProvider
   // 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.