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

chrome/browser/autocomplete/autocomplete.cc

 // 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 44 matching lines @@
 AutocompleteInput::AutocompleteInput(const std::wstring& text,
                                      const std::wstring& desired_tld,
                                      bool prevent_inline_autocomplete)
     : desired_tld_(desired_tld),
       prevent_inline_autocomplete_(prevent_inline_autocomplete) {
   // Trim whitespace from edges of input; don't inline autocomplete if there
   // was trailing whitespace.
   if (TrimWhitespace(text, TRIM_ALL, &text_) & TRIM_TRAILING)
     prevent_inline_autocomplete_ = true;
 
-  url_parse::Parsed parts;
-  type_ = Parse(text_, desired_tld, &parts, &scheme_);
+  type_ = Parse(text_, desired_tld, &parts_, &scheme_);
 
   if (type_ == INVALID)
     return;
 
   if (type_ == FORCED_QUERY && text_[0] == L'?')
     text_.erase(0, 1);
 }
 
 //static
 AutocompleteInput::Type AutocompleteInput::Parse(const std::wstring& text,
@@ skipping 159 matching lines @@
   return (text_ == other.text_) &&
          (type_ == other.type_) &&
          (desired_tld_ == other.desired_tld_) &&
          (scheme_ == other.scheme_) &&
          (prevent_inline_autocomplete_ == other.prevent_inline_autocomplete_);
 }
 
 void AutocompleteInput::Clear() {
   text_.clear();
   type_ = INVALID;
+  parts_ = url_parse::Parsed();
   scheme_.clear();
   desired_tld_.clear();
   prevent_inline_autocomplete_ = false;
 }
 
 // AutocompleteMatch ----------------------------------------------------------
 
 AutocompleteMatch::AutocompleteMatch()
     : provider(NULL),
       relevance(0),
@@ skipping 489 matching lines @@
         ACMatchClassification(keyword_offset + input_.text().size(),
                               ACMatchClassification::NONE));
   }
   match.destination_url =
       UTF8ToWide(HistoryTabUI::GetHistoryURLWithSearchText(
           input_.text()).spec());
   match.transition = PageTransition::AUTO_BOOKMARK;
   match.provider = history_contents_provider_;
   result->AddMatch(match);
 }