User input starting with http doesn't sort results properly

Fix #5578

Auditors: @aekeus

Note there is 1 more test failure I'm working on with urlbarSuggestions but it isn't related to this

app/renderer/lib/suggestion.js

@@ -71,16 +71,17 @@ module.exports.sortingPriority = (count, currentTime, lastAccessedTime, ageDecay
  *
  */
 module.exports.sortByAccessCountWithAgeDecay = (s1, s2) => {
+  const now = new Date()
   const s1Priority = module.exports.sortingPriority(
     s1.get('count') || 0,
-    (new Date()).getTime(),
-    s1.get('lastAccessedTime') || (new Date()).getTime(),
+    now.getTime(),
+    s1.get('lastAccessedTime') || now.getTime(),
     appConfig.urlSuggestions.ageDecayConstant
   )
   const s2Priority = module.exports.sortingPriority(
     s2.get('count') || 0,
-    (new Date()).getTime(),
-    s2.get('lastAccessedTime') || (new Date()).getTime(),
+    now.getTime(),
+    s2.get('lastAccessedTime') || now.getTime(),
     appConfig.urlSuggestions.ageDecayConstant
   )
   return s2Priority - s1Priority
@@ -115,6 +116,28 @@ module.exports.normalizeLocation = (location) => {
   return location
 }
 
+/*
+ * Determines based on user input if the location should
+ * be normalized.  If the user is typing http prefix then
+ * they are specifying something explicitly.
+ *
+ * @return true if urls being compared should be normalized
+ */
+module.exports.shouldNormalizeLocation = (input) => {
+  const prefixes = ['http://', 'https://', 'www.']
+  return prefixes.every((prefix) => {
+    if (input.length > prefix.length) {
+      return true
+    }
+    for (let i = 0; i < Math.min(prefix.length, input.length); i++) {
+      if (input[i] !== prefix[i]) {
+        return true
+      }
+    }
+    return false
+  })
+}
+
 /*
  * return a site representing the simple location for a
  * set of related sites without a history item for the

js/components/urlBarSuggestions.js

@@ -252,11 +252,13 @@ class UrlBarSuggestions extends ImmutableComponent {
         }
       })
 
+    const shouldNormalize = suggestion.shouldNormalizeLocation(urlLocationLower)
+    const urlLocationLowerNormalized = suggestion.normalizeLocation(urlLocationLower)
     const sortBasedOnLocationPos = (s1, s2) => {
-      const location1 = suggestion.normalizeLocation(s1.get('location'))
-      const location2 = suggestion.normalizeLocation(s2.get('location'))
-      const pos1 = location1.indexOf(urlLocationLower)
-      const pos2 = location2.indexOf(urlLocationLower)
+      const location1 = shouldNormalize ? suggestion.normalizeLocation(s1.get('location')) : s1.get('location')
+      const location2 = shouldNormalize ? suggestion.normalizeLocation(s2.get('location')) : s2.get('location')
+      const pos1 = location1.indexOf(urlLocationLowerNormalized)
+      const pos2 = location2.indexOf(urlLocationLowerNormalized)
       if (pos1 === -1 && pos2 === -1) {
         return 0
       } else if (pos1 === -1) {

test/components/urlBarSuggestionsTest.js

@@ -19,23 +19,27 @@ describe('urlbarSuggestions', function () {
 
     yield setup(this.app.client)
     yield this.app.client
-      .tabByUrl(Brave.newTabUrl)
+      .tabByIndex(0)
       .loadUrl(this.page1Url)
+      .windowByUrl(Brave.browserWindowUrl)
+      .waitUntil(function () {
+        return this.getAppState().then((val) => {
+          return val.value.sites.length === 1
+        })
+      })
+      .tabByIndex(0)
       .loadUrl(this.page2Url)
       .windowByUrl(Brave.browserWindowUrl)
       .ipcSend(messages.SHORTCUT_NEW_FRAME)
       .waitForUrl(Brave.newTabUrl)
       .windowByUrl(Brave.browserWindowUrl)
       .waitForExist('.tab[data-frame-key="2"].active')
       .waitForElementFocus(urlInput)
-       // XXX: this wait never resolves
-    /*
       .waitUntil(function () {
         return this.getAppState().then((val) => {
           return val.value.sites.length === 2
         })
       })
-    */
   })
 
   it('show suggestion when single letter is typed in', function * () {

test/unit/lib/urlSuggestionTest.js

@@ -25,6 +25,23 @@ describe('suggestion', function () {
     assert.ok(suggestion.simpleDomainNameValue(siteSimple) === 1, 'simple site returns 1')
     assert.ok(suggestion.simpleDomainNameValue(siteComplex) === 0, 'complex site returns 0')
   })
+
+  it('Determines prefixes which should be normalized', function () {
+    const prefixes = ['http://', 'https://', 'www.']
+    prefixes.forEach((prefix) => {
+      for (let i = 0; i < prefix.length; i++) {
+        const substring = prefix.substring(0, i + 1)
+        assert.equal(suggestion.shouldNormalizeLocation(substring), false)
+      }
+    })
+  })
+
+  it('Determines prefixes which should NOT be normalized', function () {
+    const prefixes = ['httphttp', 'brave.com', 'www3', 'http://www.x']
+    prefixes.forEach((prefix) => {
+      assert.equal(suggestion.shouldNormalizeLocation(prefix), true)
+    })
+  })
 })
 
 const site1 = Immutable.Map({