Fix various problems with inline autocomplete and URLs that change length dur...

chrome/browser/autocomplete/autocomplete.cc

 // Copyright (c) 2009 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.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
@@ skipping 420 matching lines @@
   ClassifyLocationInString(text.find(find_text), find_text.length(),
                            text.length(), style, classification);
 }
 
 void AutocompleteMatch::ClassifyLocationInString(
     size_t match_location,
     size_t match_length,
     size_t overall_length,
     int style,
     ACMatchClassifications* classification) {
-  // Classifying an empty match makes no sense and will lead to validation
-  // errors later.
-  DCHECK(match_length > 0);
-
   classification->clear();
 
   // Don't classify anything about an empty string
   // (AutocompleteMatch::Validate() checks this).
   if (overall_length == 0)
     return;
 
   // Mark pre-match portion of string (if any).
   if (match_location != 0) {
     classification->push_back(ACMatchClassification(0, style));
   }
 
   // Mark matching portion of string.
   if (match_location == std::wstring::npos) {
     // No match, above classification will suffice for whole string.
     return;
   }
+  // Classifying an empty match makes no sense and will lead to validation
+  // errors later.
+  DCHECK(match_length > 0);
   classification->push_back(ACMatchClassification(match_location,
       (style | ACMatchClassification::MATCH) & ~ACMatchClassification::DIM));
 
   // Mark post-match portion of string (if any).
   const size_t after_match(match_location + match_length);
   if (after_match < overall_length) {
     classification->push_back(ACMatchClassification(after_match, style));
   }
 }
 
@@ skipping 491 matching lines @@
 void AutocompleteController::CheckIfDone() {
   for (ACProviders::const_iterator i(providers_.begin()); i != providers_.end();
        ++i) {
     if (!(*i)->done()) {
       done_ = false;
       return;
     }
   }
   done_ = true;
 }