Handle view-source: URLs better in the history providers.

chrome/browser/autocomplete/history_url_provider.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/history_url_provider.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 326 matching lines @@
   const GURL& url = input.canonicalized_url();
   if (url.is_valid()) {
     match.destination_url = url;
 
     // Trim off "http://" if the user didn't type it.
     // NOTE: We use TrimHttpPrefix() here rather than StringForURLDisplay() to
     // strip the scheme as we need to know the offset so we can adjust the
     // |match_location| below.  StringForURLDisplay() and TrimHttpPrefix() have
     // slightly different behavior as well (the latter will strip even without
     // two slashes after the scheme).
+    DCHECK(!trim_http || !HasHTTPScheme(input.text()));
     string16 display_string(provider->StringForURLDisplay(url, false, false));
     const size_t offset = trim_http ? TrimHttpPrefix(&display_string) : 0;
     match.fill_into_edit =
         AutocompleteInput::FormattedStringWithEquivalentMeaning(url,
                                                                 display_string);
     match.allowed_to_be_default_match = true;
     // NOTE: Don't set match.inline_autocompletion to something non-empty here;
     // it's surprising and annoying.
 
     // Try to highlight "innermost" match location.  If we fix up "w" into
     // "www.w.com", we want to highlight the fifth character, not the first.
     // This relies on match.destination_url being the non-prefix-trimmed version
     // of match.contents.
     match.contents = display_string;
     const URLPrefix* best_prefix = URLPrefix::BestURLPrefix(
         UTF8ToUTF16(match.destination_url.spec()), input.text());
-
-    // We only want to trim the HTTP scheme off our match if the user didn't
-    // explicitly type "http:".
-    DCHECK(!trim_http || !HasHTTPScheme(input.text()));
-
-    // Because of the vagaries of GURL, it's possible for match.destination_url
-    // to not contain the user's input at all (so |best_prefix| is NULL).
-    // In this case don't mark anything as a match.
-    const size_t match_location = (best_prefix == NULL) ?
-        string16::npos : best_prefix->prefix.length() - offset;
-    AutocompleteMatch::ClassifyLocationInString(match_location,
-                                                input.text().length(),
-                                                match.contents.length(),
-                                                ACMatchClassification::URL,
-                                                &match.contents_class);
+    // It's possible for match.destination_url to not contain the user's input
+    // at all (so |best_prefix| is NULL), for example if the input is
+    // "view-source:x" and |destination_url| has an inserted "http://" in the
+    // middle.
+    if (best_prefix == NULL) {
+      AutocompleteMatch::ClassifyMatchInString(input.text(), match.contents,
+                                               ACMatchClassification::URL,
+                                               &match.contents_class);
+    } else {
+      AutocompleteMatch::ClassifyLocationInString(
+          best_prefix->prefix.length() - offset, input.text().length(),
+          match.contents.length(), ACMatchClassification::URL,
+          &match.contents_class);
+    }
 
     match.is_history_what_you_typed_match = true;
   }
 
   return match;
 }
 
 void HistoryURLProvider::Start(const AutocompleteInput& input,
                                bool minimal_changes) {
   // NOTE: We could try hard to do less work in the |minimal_changes| case
@@ skipping 700 matching lines @@
         &match.contents_class);
   }
   match.description = info.title();
   AutocompleteMatch::ClassifyMatchInString(params->input.text(),
                                            info.title(),
                                            ACMatchClassification::NONE,
                                            &match.description_class);
   RecordAdditionalInfoFromUrlRow(info, &match);
   return match;
 }