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 32 matching lines @@
                                      bool prevent_inline_autocomplete,
                                      bool prefer_keyword,
                                      bool allow_exact_keyword_match,
                                      MatchesRequested matches_requested)
     : cursor_position_(cursor_position),
       desired_tld_(desired_tld),
       prevent_inline_autocomplete_(prevent_inline_autocomplete),
       prefer_keyword_(prefer_keyword),
       allow_exact_keyword_match_(allow_exact_keyword_match),
       matches_requested_(matches_requested) {
-  DCHECK(cursor_position <= text.length() || cursor_position == string16::npos);
+  DCHECK(cursor_position <= text.length() || cursor_position == string16::npos)
+      << "Text: '" << text << "', cp: " << cursor_position;
   // None of the providers care about leading white space so we always trim it.
   // Providers that care about trailing white space handle trimming themselves.
   if ((TrimWhitespace(text, TRIM_LEADING, &text_) & TRIM_LEADING) != 0)
     AdjustCursorPositionIfNecessary(text.length() - text_.length(),
                                     &cursor_position_);
 
   GURL canonicalized_url;
   type_ = Parse(text_, desired_tld, &parts_, &scheme_, &canonicalized_url);
 
   if (type_ == INVALID)
@@ skipping 421 matching lines @@
   if (parts.query.is_nonempty())
     ++num_nonhost_components;
   if (parts.ref.is_nonempty())
     ++num_nonhost_components;
   return num_nonhost_components;
 }
 
 void AutocompleteInput::UpdateText(const string16& text,
                                    size_t cursor_position,
                                    const url_parse::Parsed& parts) {
-  DCHECK(cursor_position <= text.length() || cursor_position == string16::npos);
+  DCHECK(cursor_position <= text.length() || cursor_position == string16::npos)
+      << "Text: '" << text << "', cp: " << cursor_position;
   text_ = text;
   cursor_position_ = cursor_position;
   parts_ = parts;
 }
 
-bool AutocompleteInput::Equals(const AutocompleteInput& other) const {
-  return (text_ == other.text_) &&
-         (cursor_position_ == other.cursor_position_) &&
-         (type_ == other.type_) &&
-         (desired_tld_ == other.desired_tld_) &&
-         (scheme_ == other.scheme_) &&
-         (prevent_inline_autocomplete_ == other.prevent_inline_autocomplete_) &&
-         (prefer_keyword_ == other.prefer_keyword_) &&
-         (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;
 }