Fix cursor position for default provider searches in keyword mode.

chrome/browser/autocomplete/autocomplete_input.cc

 // 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.
 
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/external_protocol/external_protocol_handler.h"
 #include "chrome/browser/net/url_fixer_upper.h"
@@ skipping 480 matching lines @@
 
 void AutocompleteInput::UpdateText(const string16& text,
                                    size_t cursor_position,
                                    const url_parse::Parsed& parts) {
   DCHECK(cursor_position <= text.length() || cursor_position == string16::npos);
   text_ = text;
   cursor_position_ = cursor_position;
   parts_ = parts;
 }
 
+// TODO: This method does not take into account |parts_|, because
+// url_parse::Parsed struct does not provide == operator.
 bool AutocompleteInput::Equals(const AutocompleteInput& other) const {

[Mark P, 2013/01/24 04:07:21]

Can you add a reminder by the block of variable declarations in
AutocompleteInput that anyone who adds a new variables needs to update Equals()
and Clear()?

[Bart N., 2013/01/24 18:32:04]

Done.

   return (text_ == other.text_) &&
          (cursor_position_ == other.cursor_position_) &&
+         (desired_tld_ == other.desired_tld_) &&
          (type_ == other.type_) &&
-         (desired_tld_ == other.desired_tld_) &&
          (scheme_ == other.scheme_) &&
+         (canonicalized_url_ == other.canonicalized_url_) &&
          (prevent_inline_autocomplete_ == other.prevent_inline_autocomplete_) &&
          (prefer_keyword_ == other.prefer_keyword_) &&
+         (allow_exact_keyword_match_ == other.allow_exact_keyword_match_) &&
          (matches_requested_ == other.matches_requested_);
 }
 
 void AutocompleteInput::Clear() {
   text_.clear();
   cursor_position_ = string16::npos;
+  desired_tld_.clear();
   type_ = INVALID;
   parts_ = url_parse::Parsed();
   scheme_.clear();
-  desired_tld_.clear();
+  canonicalized_url_ = GURL();
   prevent_inline_autocomplete_ = false;
   prefer_keyword_ = false;
+  allow_exact_keyword_match_ = false;
+  matches_requested_ = ALL_MATCHES;
 }