Merge r1978 to Beta to stop sending queries with username info,...

chrome/browser/autocomplete/autocomplete.h

 // Copyright 2008, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //    * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //    * Redistributions in binary form must reproduce the above
@@ skipping 200 matching lines @@
   const bool prevent_inline_autocomplete() const {
     return prevent_inline_autocomplete_;
   }
 
   // operator==() by another name.
   bool Equals(const AutocompleteInput& other) const;
 
   // Resets all internal variables to the null-constructed state.
   void Clear();
 
+  // Returns parsed URL components.
+  const url_parse::Parsed& parts() const { return parts_; }
+
  private:
   std::wstring text_;
   Type type_;
+  url_parse::Parsed parts_;
   std::wstring scheme_;
   std::wstring desired_tld_;
   bool prevent_inline_autocomplete_;
 };
 
 // AutocompleteMatch ----------------------------------------------------------
 
 // A single result line with classified spans.  The autocomplete popup displays
 // the 'contents' and the 'description' (the description is optional) in the
 // autocomplete dropdown, and fills in 'fill_into_edit' into the textbox when
@@ skipping 556 matching lines @@
   // The user's input text in the omnibox.
   std::wstring text;
   // Selected index (if selected) or -1 (AutocompletePopup::kNoMatch).
   size_t selected_index;
   // Inline autocompleted length (if displayed).
   size_t inline_autocompleted_length;
   // Result set.
   const AutocompleteResult& result;
 };
 
-#endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_H__
+#endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_H_