When users navigate to an intranet host that has not been previously typed, treat it as a typed n...

chrome/browser/autocomplete/history_url_provider.cc

 // Copyright (c) 2011 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 382 matching lines @@
   for (history::Prefixes::const_iterator i(prefixes_.begin());
        i != prefixes_.end(); ++i) {
     if (params->cancel_flag.IsSet())
       return;  // Canceled in the middle of a query, give up.
     // We only need kMaxMatches results in the end, but before we get there we
     // need to promote lower-quality matches that are prefixes of
     // higher-quality matches, and remove lower-quality redirects.  So we ask
     // for more results than we need, of every prefix type, in hopes this will
     // give us far more than enough to work with.  CullRedirects() will then
     // reduce the list to the best kMaxMatches results.
-    db->AutocompleteForPrefix(i->prefix + params->input.text(),
+    db->AutocompleteForPrefix(UTF16ToUTF8(i->prefix + params->input.text()),
                               kMaxMatches * 2, (backend == NULL), &url_matches);
     for (URLRowVector::const_iterator j(url_matches.begin());
          j != url_matches.end(); ++j) {
       const history::Prefix* best_prefix = BestPrefix(j->url(), string16());
       DCHECK(best_prefix != NULL);
       history_matches.push_back(history::HistoryMatch(*j, i->prefix.length(),
           !i->num_components,
           i->num_components >= best_prefix->num_components));
     }
   }
@@ skipping 329 matching lines @@
     history::URLDatabase* db,
     const AutocompleteInput& input) const {
   // Normally passing the first two conditions below ought to guarantee the
   // third condition, but because FixupUserInput() can run and modify the
   // input's text and parts between Parse() and here, it seems better to be
   // paranoid and check.
   if ((input.type() != AutocompleteInput::UNKNOWN) ||
       !LowerCaseEqualsASCII(input.scheme(), chrome::kHttpScheme) ||
       !input.parts().host.is_nonempty())
     return false;
-  const string16 host(input.text().substr(input.parts().host.begin,
-                                          input.parts().host.len));
-  if (net::RegistryControlledDomainService::GetRegistryLength(
-      UTF16ToUTF8(host), false) != 0)
+  const std::string host(UTF16ToUTF8(
+      input.text().substr(input.parts().host.begin, input.parts().host.len)));
+  if (net::RegistryControlledDomainService::GetRegistryLength(host, false) != 0)
     return false;
-  std::vector<history::URLRow> dummy;
-  for (history::Prefixes::const_iterator i(prefixes_.begin());
-       i != prefixes_.end(); ++i) {
-    if ((i->num_components == 1) &&
-        (db->AutocompleteForPrefix(i->prefix + host + ASCIIToUTF16("/"), 1,
-                                   true, &dummy) ||
-         db->AutocompleteForPrefix(i->prefix + host + ASCIIToUTF16(":"), 1,
-                                   true, &dummy)))
-      return true;
-  }
-  return false;
+  return db->IsTypedHost(host);
 }
 
 bool HistoryURLProvider::PromoteMatchForInlineAutocomplete(
     HistoryURLProviderParams* params,
     const history::HistoryMatch& match,
     const history::HistoryMatches& matches) {
   // Promote the first match if it's been typed at least n times, where n == 1
   // for "simple" (host-only) URLs and n == 2 for others.  We set a higher bar
   // for these long URLs because it's less likely that users will want to visit
   // them again.  Even though we don't increment the typed_count for pasted-in
@@ skipping 165 matching lines @@
         &match.contents_class);
   }
   match.description = info.title();
   AutocompleteMatch::ClassifyMatchInString(params->input.text(),
                                            info.title(),
                                            ACMatchClassification::NONE,
                                            &match.description_class);
 
   return match;
 }