Correctly score intranet URLs with typed_counts of 0 as UNVISITED_INTRANET if they are on known h...

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 687 matching lines @@
     case VisitClassifier::VISITED:
       // We have data for this match, use it.
       match->deletable = true;
       match->description = classifier.url_row().title();
       AutocompleteMatch::ClassifyMatchInString(
           input.text(),
           classifier.url_row().title(),
           ACMatchClassification::NONE, &match->description_class);
       if (!classifier.url_row().typed_count()) {
         // If we reach here, we must be in the second pass, and we must not have
-        // promoted this match as an exact match during the first pass.  That
-        // means it will have been outscored by the "search what you typed
-        // match".  We need to maintain that ordering in order to not make the
-        // destination for the user's typing change depending on when they hit
-        // enter.  So lower the score here enough to let the search provider
-        // continue to outscore this match.
-        type = WHAT_YOU_TYPED;
+        // this row's data available during the first pass.  That means we
+        // either scored it as WHAT_YOU_TYPED or UNVISITED_INTRANET, and to
+        // maintain the ordering between passes consistent, we need to score it
+        // the same way here.
+        type = CanFindIntranetURL(db, input) ?
+            UNVISITED_INTRANET : WHAT_YOU_TYPED;
       }
       break;
     case VisitClassifier::UNVISITED_INTRANET:
       type = UNVISITED_INTRANET;
       break;
     default:
       DCHECK_EQ(VisitClassifier::UNVISITED, classifier.type());
       break;
   }
 
@@ skipping 20 matching lines @@
   // 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 std::string host(UTF16ToUTF8(
       input.text().substr(input.parts().host.begin, input.parts().host.len)));
-  if (net::RegistryControlledDomainService::GetRegistryLength(host, false) != 0)
-    return false;
-  return db->IsTypedHost(host);
+  return (net::RegistryControlledDomainService::GetRegistryLength(host,
+      false) == 0) && 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;
 }