From e5d2de407814bca1f877766e99dcc0623bfe1bd4 Mon Sep 17 00:00:00 2001
From: bridiver <github@brianjohnson.cc>
Date: Mon, 17 Apr 2017 18:46:26 -0700
Subject: [PATCH] first pass at action consolidation for urlbar

---
 app/common/state/frameState.js                |  24 +-
 app/common/state/navigationBarState.js        | 109 +++--
 app/common/state/tabState.js                  |  37 +-
 .../components/navigation/navigationBar.js    |  71 +--
 app/renderer/components/navigation/urlBar.js  |  37 +-
 app/renderer/reducers/urlBarReducer.js        | 424 +++++++++++++++++-
 .../reducers/urlBarSuggestionsReducer.js      | 402 -----------------
 docs/windowActions.md                         |  10 -
 js/actions/windowActions.js                   |  29 +-
 js/components/frame.js                        |   6 +-
 js/constants/windowConstants.js               |   4 +-
 js/stores/windowStore.js                      |  14 -
 test/unit/app/common/state/frameStateTest.js  |   2 +-
 .../renderer/reducers/urlBarReducerTest.js    | 180 ++++++++
 .../reducers/urlBarSuggestionsReducerTest.js  | 186 --------
 15 files changed, 786 insertions(+), 749 deletions(-)
 delete mode 100644 app/renderer/reducers/urlBarSuggestionsReducer.js
 delete mode 100644 test/unit/app/renderer/reducers/urlBarSuggestionsReducerTest.js

diff --git a/app/common/state/frameState.js b/app/common/state/frameState.js
index 3b780a082d6..dbbe8b3275e 100644
--- a/app/common/state/frameState.js
+++ b/app/common/state/frameState.js
@@ -34,14 +34,14 @@ const api = {
       // in WindowState
       const index = state.get('frames').findIndex((frame) => frame.get('key') === frameKey)
       if (index === -1) {
-        return path.concat('nosuchframe')
+        return null
       }
       return path.concat(['frames', index])
     } else {
       // in AppState
       const index = state.get('tabs').findIndex((tab) => tab.getIn(['frame', 'key']) === frameKey)
       if (index === -1) {
-        return path.concat('nosuchtab')
+        return null
       }
       return makeImmutable(['tabs', index, 'frame'])
     }
@@ -61,21 +61,33 @@ const api = {
     // in WindowState
     const index = state.get('frames').findIndex((frame) => frame.get('tabId') === tabId)
     if (index === -1) {
-      return makeImmutable(['nosuchframe'])
+      return null
     }
     return path.concat(['frames', index])
   },
 
   getByFrameKey: (state, frameKey) => {
-    return state.getIn(api.getPathByFrameKey(state, frameKey))
+    const path = api.getPathByFrameKey(state, frameKey)
+    if (path == null) {
+      return null
+    }
+    return state.getIn(path)
   },
 
   getByTabId: (state, tabId) => {
-    return state.getIn(api.getPathByTabId(state, tabId))
+    const path = api.getPathByTabId(state, tabId)
+    if (path == null) {
+      return null
+    }
+    return state.getIn(path)
   },
 
   getTabIdByFrameKey: (state, frameKey) => {
-    return state.getIn(api.getPathByFrameKey(state, frameKey).concat('tabId')) || -1
+    const path = api.getPathByFrameKey(state, frameKey)
+    if (path == null) {
+      return null
+    }
+    return state.getIn(path.concat('tabId')) || -1
   }
 }
 
diff --git a/app/common/state/navigationBarState.js b/app/common/state/navigationBarState.js
index bb31ea6d517..248500c7a7a 100644
--- a/app/common/state/navigationBarState.js
+++ b/app/common/state/navigationBarState.js
@@ -40,7 +40,11 @@ const api = {
     state = validateState(state)
     tabState.validateTabId(tabId)
 
-    return tabState.getFramePathByTabId(state, tabId).concat('navbar')
+    const path = tabState.getFramePathByTabId(state, tabId)
+    if (path == null) {
+      return null
+    }
+    return path.push('navbar')
   },
 
   getNavigationBar: (state, tabId) => {
@@ -51,15 +55,25 @@ const api = {
       return defaultState
     }
 
-    return state.getIn(api.getNavigationBarPath(state, tabId)) || defaultState
+    const path = api.getNavigationBarPath(state, tabId)
+    if (path == null) {
+      return defaultState
+    }
+
+    return state.getIn(path) || defaultState
   },
 
   getUrlBarPath: (state, tabId) => {
-    return api.getNavigationBarPath(state, tabId).concat('urlbar')
+    const path = api.getNavigationBarPath(state, tabId)
+    return path == null ? null : path.push('urlbar')
   },
 
   getUrlBar: (state, tabId) => {
-    return state.getIn(api.getUrlBarPath(state, tabId)) || defaultState.get('urlbar')
+    const path = api.getUrlBarPath(state, tabId)
+    if (path == null) {
+      return defaultState.get('urlbar')
+    }
+    return state.getIn(path) || defaultState.get('urlbar')
   },
 
   locationValueSuffix: (state, tabId) => {
@@ -103,7 +117,11 @@ const api = {
 
   setSelectedIndex: (state, tabId, index = -1) => {
     state = validateState(state)
-    return state.setIn(api.getUrlBarPath(state, tabId).concat(['suggestions', 'selectedIndex']), index)
+    const path = api.getUrlBarPath(state, tabId)
+    if (path == null) {
+      return state
+    }
+    return state.setIn(path.concat(['suggestions', 'selectedIndex']), index)
   },
 
   getSelectedIndex: (state, tabId) => {
@@ -113,8 +131,12 @@ const api = {
 
   setSuggestionList: (state, tabId, suggestionList = []) => {
     state = validateState(state)
+    const path = api.getUrlBarPath(state, tabId)
+    if (path == null) {
+      return state
+    }
     suggestionList = makeImmutable(suggestionList)
-    return state.setIn(api.getUrlBarPath(state, tabId).concat(['suggestions', 'suggestionList']), suggestionList)
+    return state.setIn(path.concat(['suggestions', 'suggestionList']), suggestionList)
   },
 
   getSuggestionList: (state, tabId) => {
@@ -133,7 +155,11 @@ const api = {
 
   setAutocompleteEnabled: (state, tabId, enabled = false) => {
     state = validateState(state)
-    return state.setIn(api.getUrlBarPath(state, tabId).concat(['suggestions', 'autocompleteEnabled']), enabled)
+    const path = api.getUrlBarPath(state, tabId)
+    if (path == null) {
+      return state
+    }
+    return state.setIn(path.concat(['suggestions', 'autocompleteEnabled']), enabled)
   },
 
   isAutocompleteEnabled: (state, tabId) => {
@@ -142,7 +168,11 @@ const api = {
 
   setLocation: (state, tabId, location, counter) => {
     state = validateState(state)
-    return state.setIn(api.getUrlBarPath(state, tabId).push('location'), location)
+    const path = api.getUrlBarPath(state, tabId)
+    if (path == null) {
+      return state
+    }
+    return state.setIn(path.push('location'), location)
   },
 
   getLocation: (state, tabId) => {
@@ -150,8 +180,13 @@ const api = {
   },
 
   setKeyCounter: (state, tabId, counter) => {
+    const path = api.getUrlBarPath(state, tabId)
+    if (path == null) {
+      return state
+    }
+
     if (counter) {
-      state = state.setIn(api.getUrlBarPath(state, tabId).push('keyCounter'), counter)
+      state = state.setIn(path.push('keyCounter'), counter)
     }
     return state
   },
@@ -162,9 +197,13 @@ const api = {
 
   setShouldRenderUrlBarSuggestions: (state, tabId, enabled = false) => {
     state = validateState(state)
-    state = state.setIn(api.getUrlBarPath(state, tabId).concat(['suggestions', 'shouldRender']), enabled)
+    const path = api.getUrlBarPath(state, tabId)
+    if (path == null) {
+      return state
+    }
+    state = state.setIn(path.concat(['suggestions', 'shouldRender']), enabled)
     if (!enabled) {
-      state = state.mergeIn(api.getUrlBarPath(state, tabId).push('suggestions'), defaultState.getIn(['urlbar', 'suggestions']))
+      state = state.mergeIn(path.push('suggestions'), defaultState.getIn(['urlbar', 'suggestions']))
     }
     return state
   },
@@ -175,39 +214,13 @@ const api = {
         suggestionList && suggestionList.size > 0
   },
 
-  setPreviousUrlBarSuggestionSelected: (state, tabId) => {
-    if (api.shouldRenderUrlBarSuggestions(state, tabId)) {
-      const selectedIndex = api.getSelectedIndex(state, tabId)
-      const lastSuffix = api.locationValueSuffix(state, tabId)
-
-      if (selectedIndex !== 0 && !lastSuffix) {
-        state = api.setSelectedIndex(state, tabId, 0)
-      } else if (selectedIndex > 0) {
-        state = api.setSelectedIndex(state, tabId, selectedIndex - 1)
-      }
-      // state = updateUrlSuffix(state, state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'suggestionList']), suggestionList))
-    }
-    return state
-  },
-
-  setNextUrlBarSuggestionSelected: (state, tabId) => {
-    if (api.shouldRenderUrlBarSuggestions(state, tabId)) {
-      const selectedIndex = api.getSelectedIndex(state, tabId)
-      const lastSuffix = api.locationValueSuffix(state, tabId)
-
-      if (selectedIndex !== 0 && !lastSuffix) {
-        state = api.setSelectedIndex(state, tabId, 0)
-      } else if (selectedIndex > 0) {
-        state = api.setSelectedIndex(state, tabId, selectedIndex - 1)
-      }
-      // state = updateUrlSuffix(state, state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'suggestionList']), suggestionList))
-    }
-    return state
-  },
-
   setActive: (state, tabId, active = false) => {
     state = validateState(state)
-    return state.setIn(api.getUrlBarPath(state, tabId).push('active'), active)
+    const path = api.getUrlBarPath(state, tabId)
+    if (path == null) {
+      return state
+    }
+    return state.setIn(path.push('active'), active)
   },
 
   isActive: (state, tabId) => {
@@ -216,7 +229,11 @@ const api = {
 
   setFocused: (state, tabId, focused = false) => {
     state = validateState(state)
-    return state.setIn(api.getUrlBarPath(state, tabId).push('focused'), focused)
+    const path = api.getUrlBarPath(state, tabId)
+    if (path == null) {
+      return state
+    }
+    return state.setIn(path.push('focused'), focused)
   },
 
   isFocused: (state, tabId) => {
@@ -225,11 +242,15 @@ const api = {
 
   setSelected: (state, tabId, selected = false) => {
     state = validateState(state)
+    const path = api.getUrlBarPath(state, tabId)
+    if (path == null) {
+      return state
+    }
     if (selected) {
       // selection implies focus
       state = state = api.setFocused(state, tabId, true)
     }
-    return state.setIn(api.getUrlBarPath(state, tabId).push('selected'), selected)
+    return state.setIn(path.push('selected'), selected)
   },
 
   isSelected: (state, tabId) => {
diff --git a/app/common/state/tabState.js b/app/common/state/tabState.js
index 52d0683b333..93ea8185b84 100644
--- a/app/common/state/tabState.js
+++ b/app/common/state/tabState.js
@@ -171,8 +171,8 @@ const tabState = {
     state = validateState(state)
 
     const index = state.get('tabs').findIndex((tab) => tab.get('tabId') === tabId)
-    if (index === -1) {
-      return makeImmutable(['nosuchpath'])
+    if (index === tabState.TAB_ID_NONE) {
+      return null
     }
     return makeImmutable(['tabs', index])
   },
@@ -185,7 +185,11 @@ const tabState = {
       return null
     }
 
-    return state.getIn(tabState.getPathByTabId(state, tabId))
+    const path = tabState.getPathByTabId(state, tabId)
+    if (path == null) {
+      return null
+    }
+    return state.getIn(path)
   },
 
   getTab: (state, tabValue) => {
@@ -305,8 +309,17 @@ const tabState = {
   getFramePathByTabId: (state, tabId) => {
     state = makeImmutable(state)
     tabId = validateId('tabId', tabId)
-    if (state.get('tabs')) {
-      return tabState.getPathByTabId(state, tabId).push('frame')
+
+    if (tabId === tabState.TAB_ID_NONE) {
+      return null
+    }
+
+    if (state.get('tabs') && !state.get('frames')) {
+      const path = tabState.getPathByTabId(state, tabId)
+      if (path == null) {
+        return null
+      }
+      return path.push('frame')
     } else {
       return frameState.getPathByTabId(state, tabId)
     }
@@ -324,32 +337,36 @@ const tabState = {
   },
 
   getFrameByTabId: (state, tabId) => {
+    const path = tabState.getFramePathByTabId(state, tabId)
+    if (path == null) {
+      return null
+    }
     return state.getIn(tabState.getFramePathByTabId(state, tabId))
   },
 
   isSecure: (state, tabId) => {
     const frame = tabState.getFrameByTabId(state, tabId)
-    return frameStateUtil.isFrameSecure(frame)
+    return frame ? frameStateUtil.isFrameSecure(frame) : null
   },
 
   isLoading: (state, tabId) => {
     const frame = tabState.getFrameByTabId(state, tabId)
-    return frameStateUtil.isFrameLoading(frame)
+    return frame ? frameStateUtil.isFrameLoading(frame) : null
   },
 
   startLoadTime: (state, tabId) => {
     const frame = tabState.getFrameByTabId(state, tabId)
-    return frameStateUtil.startLoadTime(frame)
+    return frame ? frameStateUtil.startLoadTime(frame) : null
   },
 
   endLoadTime: (state, tabId) => {
     const frame = tabState.getFrameByTabId(state, tabId)
-    return frameStateUtil.endLoadTime(frame)
+    return frame ? frameStateUtil.endLoadTime(frame) : null
   },
 
   getHistory: (state, tabId) => {
     const frame = tabState.getFrameByTabId(state, tabId)
-    return frameStateUtil.getHistory(frame)
+    return frame ? frameStateUtil.getHistory(frame) : null
   },
 
   getLocation: (state, tabId) => {
diff --git a/app/renderer/components/navigation/navigationBar.js b/app/renderer/components/navigation/navigationBar.js
index bda38294ed9..ff86580d514 100644
--- a/app/renderer/components/navigation/navigationBar.js
+++ b/app/renderer/components/navigation/navigationBar.js
@@ -44,10 +44,6 @@ class NavigationBar extends React.Component {
     return windowStore.getFrame(this.props.activeFrameKey)
   }
 
-  get loading () {
-    return this.props.activeFrameKey !== undefined && this.props.loading
-  }
-
   onToggleBookmark () {
     const editing = this.bookmarked
     // show the AddEditBookmarkHanger control; saving/deleting takes place there
@@ -111,21 +107,6 @@ class NavigationBar extends React.Component {
       }))
   }
 
-  get titleMode () {
-    const hasTitle = this.props.title && this.props.location && this.props.title !== this.props.location.replace(/^https?:\/\//, '')
-    return this.props.activeTabShowingMessageBox ||
-      (
-        this.props.mouseInTitlebar === false &&
-        !this.props.bookmarkDetail &&
-        hasTitle &&
-        !['about:blank', 'about:newtab'].includes(this.props.location) &&
-        !this.loading &&
-        !this.props.navbar.getIn(['urlbar', 'focused']) &&
-        !this.props.navbar.getIn(['urlbar', 'active']) &&
-        getSetting(settings.DISABLE_TITLE_MODE) === false
-      )
-  }
-
   componentDidMount () {
     ipc.on(messages.SHORTCUT_ACTIVE_FRAME_BOOKMARK, () => this.onToggleBookmark())
     ipc.on(messages.SHORTCUT_ACTIVE_FRAME_REMOVE_BOOKMARK, () => this.onToggleBookmark())
@@ -134,26 +115,50 @@ class NavigationBar extends React.Component {
   mergeProps (state, dispatchProps, ownProps) {
     const windowState = state.get('currentWindow')
     const activeFrame = frameStateUtil.getActiveFrame(windowState) || Immutable.Map()
+    const activeFrameKey = activeFrame.get('key')
     const activeTabId = tabState.getActiveTabId(state, getCurrentWindowId())
+
+    const activeTabShowingMessageBox = tabState.isShowingMessageBox(state, activeTabId)
+    const bookmarkDetail = windowState.get('bookmarkDetail')
+    const mouseInTitlebar = windowState.getIn(['ui', 'mouseInTitlebar'])
+    const title = activeFrame.get('title') || ''
+    const loading = activeFrame.get('loading')
+    const location = activeFrame.get('location') || ''
+    const navbar = activeFrame.get('navbar') || Immutable.Map()
+
+    const hasTitle = title && location && title !== location.replace(/^https?:\/\//, '')
+    const titleMode = activeTabShowingMessageBox ||
+      (
+        mouseInTitlebar === false &&
+        !bookmarkDetail &&
+        hasTitle &&
+        !['about:blank', 'about:newtab'].includes(location) &&
+        !loading &&
+        !navbar.getIn(['urlbar', 'focused']) &&
+        !navbar.getIn(['urlbar', 'active']) &&
+        getSetting(settings.DISABLE_TITLE_MODE) === false
+      )
+
     const props = {}
 
-    props.navbar = activeFrame.get('navbar')
+    props.navbar = navbar
     props.sites = state.get('sites')
-    props.activeFrameKey = activeFrame.get('key')
-    props.location = activeFrame.get('location') || ''
-    props.title = activeFrame.get('title') || ''
+    props.activeFrameKey = activeFrameKey
+    props.location = location
+    props.title = title
     props.partitionNumber = activeFrame.get('partitionNumber') || 0
     props.isSecure = activeFrame.getIn(['security', 'isSecure'])
-    props.loading = activeFrame.get('loading')
-    props.bookmarkDetail = windowState.get('bookmarkDetail')
-    props.mouseInTitlebar = windowState.getIn(['ui', 'mouseInTitlebar'])
+    props.loading = loading
+    props.bookmarkDetail = bookmarkDetail
+    props.mouseInTitlebar = mouseInTitlebar
     props.enableNoScript = ownProps.enableNoScript
     props.settings = state.get('settings')
     props.menubarVisible = ownProps.menubarVisible
     props.siteSettings = state.get('siteSettings')
     props.synopsis = state.getIn(['publisherInfo', 'synopsis']) || new Immutable.Map()
-    props.activeTabShowingMessageBox = tabState.isShowingMessageBox(state, activeTabId)
+    props.activeTabShowingMessageBox = activeTabShowingMessageBox
     props.locationInfo = state.get('locationInfo')
+    props.titleMode = titleMode
 
     return props
   }
@@ -168,7 +173,7 @@ class NavigationBar extends React.Component {
       ref='navigator'
       data-frame-key={this.props.activeFrameKey}
       className={cx({
-        titleMode: this.titleMode
+        titleMode: this.props.titleMode
       })}>
       {
         this.props.bookmarkDetail && this.props.bookmarkDetail.get('isBookmarkHanger')
@@ -182,9 +187,9 @@ class NavigationBar extends React.Component {
         : null
       }
       {
-        this.titleMode
+        this.props.titleMode
         ? null
-        : this.loading
+        : this.props.loading
           ? <span className='navigationButtonContainer'>
             <button data-l10n-id='stopButton'
               className='navigationButton stopButton'
@@ -199,7 +204,7 @@ class NavigationBar extends React.Component {
           </span>
       }
       {
-        !this.titleMode && getSetting(settings.SHOW_HOME_BUTTON)
+        !this.props.titleMode && getSetting(settings.SHOW_HOME_BUTTON)
         ? <span className='navigationButtonContainer'>
           <button data-l10n-id='homeButton'
             className='navigationButton homeButton'
@@ -209,7 +214,7 @@ class NavigationBar extends React.Component {
       }
       <div className='startButtons'>
         {
-          !this.titleMode
+          !this.props.titleMode
           ? <span className='bookmarkButtonContainer'>
             <button data-l10n-id={this.bookmarked ? 'removeBookmarkButton' : 'addBookmarkButton'}
               className={cx({
@@ -224,7 +229,7 @@ class NavigationBar extends React.Component {
         }
       </div>
       <UrlBar
-        titleMode={this.titleMode}
+        titleMode={this.props.titleMode}
         onStop={this.onStop}
         menubarVisible={this.props.menubarVisible}
         enableNoScript={this.props.enableNoScript}
diff --git a/app/renderer/components/navigation/urlBar.js b/app/renderer/components/navigation/urlBar.js
index 6bb2e505025..5fd2c90b473 100644
--- a/app/renderer/components/navigation/urlBar.js
+++ b/app/renderer/components/navigation/urlBar.js
@@ -212,19 +212,7 @@ class UrlBar extends React.Component {
   }
 
   onBlur (e) {
-    // We intentionally do not setUrlBarFocused(false) here because
-    // that state is for managing when it should be set if it is active.
-    windowActions.setNavBarUserInput(e.target.value)
-
-    if (!eventElHasAncestorWithClasses(e, ['urlBarSuggestions', 'urlbarForm'])) {
-      this.updateLocationToSuggestion()
-    }
-  }
-
-  updateLocationToSuggestion () {
-    if (this.props.locationValueSuffix.length > 0) {
-      windowActions.setNavBarUserInput(this.props.locationValue + this.props.locationValueSuffix)
-    }
+    windowActions.urlBarOnBlur(getCurrentWindowId(), e.target.value, this.props.locationValue, eventElHasAncestorWithClasses(e, ['urlBarSuggestions', 'urlbarForm']))
   }
 
   get suggestionLocation () {
@@ -304,8 +292,7 @@ class UrlBar extends React.Component {
 
   onFocus (e) {
     this.select()
-    windowActions.setUrlBarFocused(true)
-    windowActions.setUrlBarSelected(true)
+    windowActions.urlBarOnFocus(getCurrentWindowId())
   }
 
   componentWillMount () {
@@ -315,9 +302,8 @@ class UrlBar extends React.Component {
       this.focus()
       this.select()
       windowActions.setRenderUrlBarSuggestions(false)
-      windowActions.setUrlBarFocused(true)
-      windowActions.setUrlBarSelected(true)
       windowActions.setUrlBarActive(true)
+      windowActions.urlBarOnFocus(getCurrentWindowId())
     })
   }
 
@@ -394,14 +380,6 @@ class UrlBar extends React.Component {
     return ['about:', 'file:', 'chrome:', 'view-source:'].includes(protocol)
   }
 
-  get isHTTPPage () {
-    // Whether this page is HTTP or HTTPS. We don't show security indicators
-    // for other protocols like mailto: and about:.
-    const protocol = urlParse(
-      UrlUtil.getLocationIfPDF(this.props.location)).protocol
-    return protocol === 'http:' || protocol === 'https:'
-  }
-
   get shouldRenderUrlBarSuggestions () {
     return this.props.shouldRender === true &&
       this.props.suggestionList && this.props.suggestionList.size > 0
@@ -454,6 +432,12 @@ class UrlBar extends React.Component {
       searchURL = provider.get('search')
     }
 
+    // Whether this page is HTTP or HTTPS. We don't show security indicators
+    // for other protocols like mailto: and about:.
+    const protocol = urlParse(
+      UrlUtil.getLocationIfPDF(location)).protocol
+    const isHTTPPage = protocol === 'http:' || protocol === 'https:'
+
     const props = {}
 
     props.activeTabId = activeTabId
@@ -483,6 +467,7 @@ class UrlBar extends React.Component {
     props.isActive = urlbar.get('active')
     props.isSelected = urlbar.get('selected')
     props.isFocused = urlbar.get('focused')
+    props.isHTTPPage = isHTTPPage
     props.activateSearchEngine = activateSearchEngine
     props.searchSelectEntry = urlbarSearchDetail
     props.autocompleteEnabled = urlbar.getIn(['suggestions', 'autocompleteEnabled'])
@@ -506,7 +491,7 @@ class UrlBar extends React.Component {
           activateSearchEngine={this.props.activateSearchEngine}
           active={this.props.isActive}
           isSecure={this.props.isSecure}
-          isHTTPPage={this.isHTTPPage}
+          isHTTPPage={this.props.isHTTPPage}
           loading={this.props.loading}
           location={this.props.location}
           searchSelectEntry={this.props.searchSelectEntry}
diff --git a/app/renderer/reducers/urlBarReducer.js b/app/renderer/reducers/urlBarReducer.js
index 9a5b67a836e..3f738ae73dd 100644
--- a/app/renderer/reducers/urlBarReducer.js
+++ b/app/renderer/reducers/urlBarReducer.js
@@ -5,9 +5,309 @@
 'use strict'
 
 const windowConstants = require('../../../js/constants/windowConstants')
-const {getSourceAboutUrl, getSourceMagnetUrl} = require('../../../js/lib/appUrlUtil')
+const {aboutUrls, isNavigatableAboutPage, isSourceAboutUrl, isUrl, getSourceAboutUrl, getSourceMagnetUrl} = require('../../../js/lib/appUrlUtil')
 const {isURL, isPotentialPhishingUrl, getUrlFromInput} = require('../../../js/lib/urlutil')
-const {activeFrameStatePath, frameStatePath, frameStatePathForFrame, getActiveFrame, tabStatePath, getFrameByTabId} = require('../../../js/state/frameStateUtil')
+const {getFrameByKey, getFrameKeyByTabId, activeFrameStatePath, frameStatePath, frameStatePathForFrame, getActiveFrame, tabStatePath, getFrameByTabId} = require('../../../js/state/frameStateUtil')
+const getSetting = require('../../../js/settings').getSetting
+const {isDefaultEntry} = require('../../../js/state/siteUtil')
+const fetchSearchSuggestions = require('../fetchSearchSuggestions')
+const searchProviders = require('../../../js/data/searchProviders')
+const settings = require('../../../js/constants/settings')
+const Immutable = require('immutable')
+const config = require('../../../js/constants/config')
+const top500 = require('../../../js/data/top500')
+const siteTags = require('../../../js/constants/siteTags')
+const suggestion = require('../lib/suggestion')
+const suggestionTypes = require('../../../js/constants/suggestionTypes')
+const {navigateSiteClickHandler, frameClickHandler} = require('../suggestionClickHandlers')
+const appStoreRenderer = require('../../../js/stores/appStoreRenderer')
+
+const navigationBarState = require('../../common/state/navigationBarState')
+const tabState = require('../../common/state/tabState')
+
+const updateSearchEngineInfoFromInput = (state, frameProps) => {
+  const input = frameProps.getIn(['navbar', 'urlbar', 'location'])
+  const frameSearchDetail = frameProps.getIn(['navbar', 'urlbar', 'searchDetail'])
+  const searchDetailPath = frameStatePath(state, frameProps.get('key')).concat(['navbar', 'urlbar', 'searchDetail'])
+  if (!input || !input.length || isUrl(input) || !input.startsWith(':')) {
+    state = state.deleteIn(searchDetailPath)
+  } else if (!frameSearchDetail || !input.startsWith(frameSearchDetail.get('shortcut') + ' ')) {
+    let entries = searchProviders.providers
+    for (let i = 0; i < entries.length; i++) {
+      const entry = entries[i]
+      if (input.startsWith(entry.shortcut + ' ')) {
+        state = state.setIn(
+          searchDetailPath,
+          Immutable.fromJS(Object.assign({}, entry, { activateSearchEngine: true })))
+        return state
+      }
+    }
+    state = state.deleteIn(searchDetailPath)
+  }
+  return state
+}
+
+const searchXHR = (state, frameProps, searchOnline) => {
+  const searchDetail = state.get('searchDetail')
+  const frameSearchDetail = frameProps.getIn(['navbar', 'urlbar', 'searchDetail'])
+  let autocompleteURL = frameSearchDetail
+    ? frameSearchDetail.get('autocomplete')
+    : searchDetail.get('autocompleteURL')
+  if (!getSetting(settings.OFFER_SEARCH_SUGGESTIONS) || !autocompleteURL) {
+    state = state.setIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'searchResults']), Immutable.fromJS([]))
+    return state
+  }
+
+  let input = frameProps.getIn(['navbar', 'urlbar', 'location'])
+  if (!isUrl(input) && input.length > 0) {
+    if (searchDetail) {
+      const replaceRE = new RegExp('^' + searchDetail.get('shortcut') + ' ', 'g')
+      input = input.replace(replaceRE, '')
+    }
+
+    if (searchOnline) {
+      fetchSearchSuggestions(frameProps.get('tabId'), autocompleteURL, input)
+    }
+  } else {
+    state = state.setIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'searchResults']), Immutable.fromJS([]))
+  }
+  return state
+}
+
+const setUrlSuggestions = (state, suggestionList) => {
+  if (suggestionList !== undefined) {
+    state = state.setIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'suggestionList']), suggestionList)
+  }
+  state = updateUrlSuffix(state, suggestionList)
+  return state
+}
+
+const setRenderUrlBarSuggestions = (state, enabled) => {
+  state = state.setIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'shouldRender']), enabled)
+  if (!enabled) {
+    state = state.mergeIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions']), {
+      selectedIndex: null,
+      suggestionList: null
+    })
+    // Make sure to remove the suffix from the url bar
+    state = state.setIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'selectedIndex']), null)
+    state = updateUrlSuffix(state, undefined)
+  }
+  return state
+}
+
+/**
+ * Updates the active frame state with what the URL bar suffix should be.
+ * @param suggestionList - The suggestion list to use to figure out the suffix.
+ */
+const updateUrlSuffix = (state, suggestionList) => {
+  let selectedIndex = state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'selectedIndex'])) || 0
+  const lastSuffix = state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'urlSuffix']))
+  if (!selectedIndex && lastSuffix) {
+    selectedIndex = 0
+  }
+  const suggestion = suggestionList && suggestionList.get(selectedIndex)
+  let suffix = ''
+  if (suggestion) {
+    const autocompleteEnabled = state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'autocompleteEnabled']))
+
+    if (autocompleteEnabled) {
+      const location = state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'location'])) || ''
+      const index = suggestion.location.toLowerCase().indexOf(location.toLowerCase())
+      if (index !== -1) {
+        const beforePrefix = suggestion.location.substring(0, index)
+        if (beforePrefix.endsWith('://') || beforePrefix.endsWith('://www.') || index === 0) {
+          suffix = suggestion.location.substring(index + location.length)
+        }
+      }
+    }
+  }
+  state = state.setIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'urlSuffix']), suffix)
+  return state
+}
+
+const generateNewSuggestionsList = (state) => {
+  const activeFrameKey = state.get('activeFrameKey')
+  const urlLocation = state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'location']))
+  let sites = appStoreRenderer.state.get('sites')
+  if (sites) {
+    // Filter out Brave default newtab sites and sites with falsey location
+    sites = sites.filter((site) => !isDefaultEntry(site) && site.get('location'))
+  }
+  const searchResults = state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'searchResults']))
+  const frameSearchDetail = state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'searchDetail']))
+  const searchDetail = state.get('searchDetail')
+
+  if (!urlLocation) {
+    return state
+  }
+
+  const urlLocationLower = urlLocation.toLowerCase()
+  let suggestionsList = new Immutable.List()
+  const defaultme = (x) => x
+  const mapListToElements = ({data, maxResults, type, clickHandler = navigateSiteClickHandler.bind(this),
+      sortHandler = defaultme, formatTitle = defaultme, formatUrl = defaultme,
+      filterValue = (site) => {
+        return site.toLowerCase().includes(urlLocationLower)
+      }
+  }) => // Filter out things which are already in our own list at a smaller index
+    data
+    // Per suggestion provider filter
+    .filter(filterValue)
+    // Filter out things which are already in the suggestions list
+    .filter((site) =>
+      suggestionsList.findIndex((x) => (x.location || '').toLowerCase() === (formatUrl(site) || '').toLowerCase()) === -1 ||
+        // Tab autosuggestions should always be included since they will almost always be in history
+        type === suggestionTypes.TAB)
+    .sort(sortHandler)
+    .take(maxResults)
+    .map((site) => {
+      return {
+        onClick: clickHandler.bind(null, site),
+        title: formatTitle(site),
+        location: formatUrl(site),
+        type
+      }
+    })
+
+  const shouldNormalize = suggestion.shouldNormalizeLocation(urlLocationLower)
+  const urlLocationLowerNormalized = suggestion.normalizeLocation(urlLocationLower)
+  const sortBasedOnLocationPos = (s1, s2) => {
+    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) {
+      return 1
+    } else if (pos2 === -1) {
+      return -1
+    } else {
+      if (pos1 - pos2 !== 0) {
+        return pos1 - pos2
+      } else {
+        // sort site.com higher than site.com/somepath
+        const sdnv1 = suggestion.simpleDomainNameValue(s1)
+        const sdnv2 = suggestion.simpleDomainNameValue(s2)
+        if (sdnv1 !== sdnv2) {
+          return sdnv2 - sdnv1
+        } else {
+          // If there's a tie on the match location, use the age
+          // decay modified access count
+          return suggestion.sortByAccessCountWithAgeDecay(s1, s2)
+        }
+      }
+    }
+  }
+
+  const historyFilter = (site) => {
+    if (!site) {
+      return false
+    }
+    const title = site.get('title') || ''
+    const location = site.get('location') || ''
+    // Note: Bookmark sites are now included in history. This will allow
+    // sites to appear in the auto-complete regardless of their bookmark
+    // status. If history is turned off, bookmarked sites will appear
+    // in the bookmark section.
+    return (title.toLowerCase().includes(urlLocationLower) ||
+            location.toLowerCase().includes(urlLocationLower)) &&
+            site.get('lastAccessedTime')
+  }
+  var historySites = sites.filter(historyFilter)
+
+  // potentially append virtual history items (such as www.google.com when
+  // searches have been made but the root site has not been visited)
+  historySites = historySites.concat(suggestion.createVirtualHistoryItems(historySites))
+
+  // history
+  if (getSetting(settings.HISTORY_SUGGESTIONS)) {
+    suggestionsList = suggestionsList.concat(mapListToElements({
+      data: historySites,
+      maxResults: config.urlBarSuggestions.maxHistorySites,
+      type: suggestionTypes.HISTORY,
+      clickHandler: navigateSiteClickHandler((site) => {
+        return site.get('location')
+      }),
+      sortHandler: sortBasedOnLocationPos,
+      formatTitle: (site) => site.get('title'),
+      formatUrl: (site) => site.get('location'),
+      filterValue: historyFilter
+    }))
+  }
+
+  // bookmarks
+  if (getSetting(settings.BOOKMARK_SUGGESTIONS)) {
+    suggestionsList = suggestionsList.concat(mapListToElements({
+      data: sites,
+      maxResults: config.urlBarSuggestions.maxBookmarkSites,
+      type: suggestionTypes.BOOKMARK,
+      clickHandler: navigateSiteClickHandler((site) => {
+        return site.get('location')
+      }),
+      sortHandler: sortBasedOnLocationPos,
+      formatTitle: (site) => site.get('title'),
+      formatUrl: (site) => site.get('location'),
+      filterValue: (site) => {
+        const title = site.get('title') || ''
+        const location = site.get('location') || ''
+        return (title.toLowerCase().includes(urlLocationLower) ||
+          location.toLowerCase().includes(urlLocationLower)) &&
+          site.get('tags') && site.get('tags').includes(siteTags.BOOKMARK)
+      }
+    }))
+  }
+
+  // about pages
+  suggestionsList = suggestionsList.concat(mapListToElements({
+    data: aboutUrls.keySeq().filter((x) => isNavigatableAboutPage(x)),
+    maxResults: config.urlBarSuggestions.maxAboutPages,
+    type: suggestionTypes.ABOUT_PAGES,
+    clickHandler: navigateSiteClickHandler((x) => x)}))
+
+  // opened frames
+  if (getSetting(settings.OPENED_TAB_SUGGESTIONS)) {
+    suggestionsList = suggestionsList.concat(mapListToElements({
+      data: state.get('frames'),
+      maxResults: config.urlBarSuggestions.maxOpenedFrames,
+      type: suggestionTypes.TAB,
+      clickHandler: frameClickHandler,
+      sortHandler: sortBasedOnLocationPos,
+      formatTitle: (frame) => frame.get('title'),
+      formatUrl: (frame) => frame.get('location'),
+      filterValue: (frame) => !isSourceAboutUrl(frame.get('location')) &&
+        frame.get('key') !== activeFrameKey &&
+        (
+          (frame.get('title') && frame.get('title').toLowerCase().includes(urlLocationLower)) ||
+          (frame.get('location') && frame.get('location').toLowerCase().includes(urlLocationLower))
+        )
+    }))
+  }
+
+  // Search suggestions
+  if (getSetting(settings.OFFER_SEARCH_SUGGESTIONS) && searchResults) {
+    suggestionsList = suggestionsList.concat(mapListToElements({
+      data: searchResults,
+      maxResults: config.urlBarSuggestions.maxSearch,
+      type: suggestionTypes.SEARCH,
+      clickHandler: navigateSiteClickHandler((searchTerms) => {
+        let searchURL = frameSearchDetail
+        ? frameSearchDetail.get('search') : searchDetail.get('searchURL')
+        return searchURL.replace('{searchTerms}', encodeURIComponent(searchTerms))
+      })
+    }))
+  }
+
+  // Alexa top 500
+  suggestionsList = suggestionsList.concat(mapListToElements({
+    data: top500,
+    maxResults: config.urlBarSuggestions.maxTopSites,
+    type: suggestionTypes.TOP_SITE,
+    clickHandler: navigateSiteClickHandler((x) => x)}))
+
+  return setUrlSuggestions(state, suggestionsList)
+}
 
 const getLocation = (location) => {
   location = location.trim()
@@ -46,10 +346,37 @@ const navigationAborted = (state, action) => {
   return state
 }
 
+const setNavBarUserInput = (state, location) => {
+  state = updateNavBarInput(state, location)
+  const activeFrameProps = getActiveFrame(state)
+  state = updateSearchEngineInfoFromInput(state, activeFrameProps)
+  state = searchXHR(state, activeFrameProps, true)
+  state = generateNewSuggestionsList(state)
+  state = updateUrlSuffix(state, state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'suggestionList']), []))
+  if (!location) {
+    state = setRenderUrlBarSuggestions(state, false)
+  }
+  return state
+}
+
+const setActive = (state, isActive) => {
+  state = state.setIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'active']), isActive)
+  if (!isActive) {
+    state = state.setIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'shouldRender']), false)
+    state = state.mergeIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions']), {
+      selectedIndex: null,
+      suggestionList: null
+    })
+  }
+  return state
+}
+
 const urlBarReducer = (state, action) => {
+  const tabId = state.getIn(activeFrameStatePath(state).concat(['tabId']), tabState.TAB_ID_NONE)
+
   switch (action.actionType) {
     case windowConstants.WINDOW_SET_NAVBAR_INPUT:
-      state = updateNavBarInput(state, action.location)
+      state = setNavBarUserInput(state, action.location)
       break
     case windowConstants.WINDOW_SET_NAVIGATED:
       // For about: URLs, make sure we store the URL as about:something
@@ -99,10 +426,101 @@ const urlBarReducer = (state, action) => {
       if (isPotentialPhishingUrl(action.location)) {
         state = state.setIn(['ui', 'siteInfo', 'isVisible'], true)
       }
+
+      state = state.setIn(frameStatePath(state, key).concat(['navbar', 'urlbar', 'suggestions', 'shouldRender']), false)
+      const frame = getFrameByKey(state, key)
+      state = updateSearchEngineInfoFromInput(state, frame)
       break
     case windowConstants.WINDOW_SET_NAVIGATION_ABORTED:
       state = navigationAborted(state, action)
       break
+    case windowConstants.WINDOW_URL_BAR_ON_FOCUS:
+      state = navigationBarState.setFocused(state, tabId, true)
+      state = navigationBarState.setSelected(state, tabId, true)
+      break
+    case windowConstants.WINDOW_URL_BAR_ON_BLUR:
+      state = setNavBarUserInput(state, action.targetValue)
+      if (!action.fromSuggestion && action.locationValue.length > 0) {
+        const locationValueSuffix = navigationBarState.locationValueSuffix(state, tabId)
+        setNavBarUserInput(state, action.locationValue + locationValueSuffix)
+      }
+      break
+    case windowConstants.WINDOW_TAB_ON_FOCUS:
+      state = navigationBarState.setFocused(state, tabId, false)
+      state = setActive(state, false)
+      break
+    case windowConstants.WINDOW_SET_URL_BAR_SELECTED:
+      const urlBarPath = activeFrameStatePath(state).concat(['navbar', 'urlbar'])
+      state = state.mergeIn(urlBarPath, {
+        selected: action.selected
+      })
+      // selection implies focus
+      if (action.selected) {
+        state = state.setIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'focused']), true)
+      }
+      break
+    case windowConstants.WINDOW_SET_FINDBAR_SHOWN:
+      if (action.shown) {
+        state = state.setIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'shouldRender']), false)
+      }
+      break
+    case windowConstants.WINDOW_PREVIOUS_URL_BAR_SUGGESTION_SELECTED: {
+      const selectedIndexPath = activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'selectedIndex'])
+      const suggestionList = state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'suggestionList']))
+      const selectedIndex = state.getIn(selectedIndexPath)
+      const lastSuffix = state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'urlSuffix']))
+      if (!selectedIndex && selectedIndex !== 0 && !lastSuffix) {
+        state = state.setIn(selectedIndexPath, 0)
+      } else if (selectedIndex > 0) {
+        state = state.setIn(selectedIndexPath, selectedIndex - 1)
+      } else {
+        state = state.setIn(selectedIndexPath, suggestionList.size - 1)
+      }
+      state = updateUrlSuffix(state, state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'suggestionList']), suggestionList))
+      break
+    }
+    case windowConstants.WINDOW_NEXT_URL_BAR_SUGGESTION_SELECTED: {
+      const selectedIndexPath = activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'selectedIndex'])
+      const suggestionList = state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'suggestionList']))
+      const selectedIndex = state.getIn(selectedIndexPath)
+      const lastSuffix = state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'urlSuffix']))
+      if (!selectedIndex && selectedIndex !== 0 && !lastSuffix) {
+        state = state.setIn(selectedIndexPath, 0)
+      } else if (selectedIndex < suggestionList.size - 1) {
+        state = state.setIn(selectedIndexPath, selectedIndex + 1)
+      } else if (selectedIndex === suggestionList.size - 1) {
+        state = state.setIn(selectedIndexPath, 0)
+      }
+      state = updateUrlSuffix(state, state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'suggestionList']), suggestionList))
+      break
+    }
+    case windowConstants.WINDOW_SEARCH_SUGGESTION_RESULTS_AVAILABLE:
+      const frameKey = getFrameKeyByTabId(state, action.tabId)
+      state = state.setIn(frameStatePath(state, frameKey).concat(['navbar', 'urlbar', 'suggestions', 'searchResults']), action.searchResults)
+      state = generateNewSuggestionsList(state)
+      break
+    case windowConstants.WINDOW_URL_BAR_AUTOCOMPLETE_ENABLED:
+      state = state.setIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'autocompleteEnabled']), action.enabled)
+      break
+    case windowConstants.WINDOW_SET_URL_BAR_SUGGESTIONS:
+      state = state.setIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'selectedIndex']), action.selectedIndex)
+      state = setUrlSuggestions(state, action.suggestionList)
+      break
+    case windowConstants.WINDOW_SET_URL_BAR_ACTIVE:
+      state = setActive(state, action.isActive)
+      break
+    case windowConstants.WINDOW_SET_RENDER_URL_BAR_SUGGESTIONS:
+      state = setRenderUrlBarSuggestions(state, action.enabled)
+      break
+    case windowConstants.WINDOW_ACTIVE_URL_BAR_SUGGESTION_CLICKED:
+      const selectedIndex = state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'selectedIndex'])) || 0
+      const suggestionList = state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'suggestionList']))
+      if (suggestionList.size > 0) {
+        // It's important this doesn't run sync or else the returned state below will overwrite anything done in the click handler
+        setImmediate(() =>
+          suggestionList.get(selectedIndex).onClick(action.isForSecondaryAction, action.shiftKey))
+      }
+      break
   }
   return state
 }
diff --git a/app/renderer/reducers/urlBarSuggestionsReducer.js b/app/renderer/reducers/urlBarSuggestionsReducer.js
deleted file mode 100644
index 94ef68fb404..00000000000
--- a/app/renderer/reducers/urlBarSuggestionsReducer.js
+++ /dev/null
@@ -1,402 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-'use strict'
-
-const windowConstants = require('../../../js/constants/windowConstants')
-const getSetting = require('../../../js/settings').getSetting
-const {isDefaultEntry} = require('../../../js/state/siteUtil')
-const fetchSearchSuggestions = require('../fetchSearchSuggestions')
-const {activeFrameStatePath, frameStatePath, getFrameByKey, getFrameKeyByTabId, getActiveFrame} = require('../../../js/state/frameStateUtil')
-const searchProviders = require('../../../js/data/searchProviders')
-const settings = require('../../../js/constants/settings')
-const Immutable = require('immutable')
-const config = require('../../../js/constants/config')
-const top500 = require('../../../js/data/top500')
-const {aboutUrls, isNavigatableAboutPage, isSourceAboutUrl, isUrl} = require('../../../js/lib/appUrlUtil')
-const siteTags = require('../../../js/constants/siteTags')
-const suggestion = require('../lib/suggestion')
-const suggestionTypes = require('../../../js/constants/suggestionTypes')
-const {navigateSiteClickHandler, frameClickHandler} = require('../suggestionClickHandlers')
-// TODO: I think appStoreRenderer should just be collapsed into windowStore to avoid this
-const appStoreRenderer = require('../../../js/stores/appStoreRenderer')
-
-const updateSearchEngineInfoFromInput = (state, frameProps) => {
-  const input = frameProps.getIn(['navbar', 'urlbar', 'location'])
-  const frameSearchDetail = frameProps.getIn(['navbar', 'urlbar', 'searchDetail'])
-  const searchDetailPath = frameStatePath(state, frameProps.get('key')).concat(['navbar', 'urlbar', 'searchDetail'])
-  if (!input || !input.length || isUrl(input) || !input.startsWith(':')) {
-    state = state.deleteIn(searchDetailPath)
-  } else if (!frameSearchDetail || !input.startsWith(frameSearchDetail.get('shortcut') + ' ')) {
-    let entries = searchProviders.providers
-    for (let i = 0; i < entries.length; i++) {
-      const entry = entries[i]
-      if (input.startsWith(entry.shortcut + ' ')) {
-        state = state.setIn(
-          searchDetailPath,
-          Immutable.fromJS(Object.assign({}, entry, { activateSearchEngine: true })))
-        return state
-      }
-    }
-    state = state.deleteIn(searchDetailPath)
-  }
-  return state
-}
-
-const searchXHR = (state, frameProps, searchOnline) => {
-  const searchDetail = state.get('searchDetail')
-  const frameSearchDetail = frameProps.getIn(['navbar', 'urlbar', 'searchDetail'])
-  let autocompleteURL = frameSearchDetail
-    ? frameSearchDetail.get('autocomplete')
-    : searchDetail.get('autocompleteURL')
-  if (!getSetting(settings.OFFER_SEARCH_SUGGESTIONS) || !autocompleteURL) {
-    state = state.setIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'searchResults']), Immutable.fromJS([]))
-    return state
-  }
-
-  let input = frameProps.getIn(['navbar', 'urlbar', 'location'])
-  if (!isUrl(input) && input.length > 0) {
-    if (searchDetail) {
-      const replaceRE = new RegExp('^' + searchDetail.get('shortcut') + ' ', 'g')
-      input = input.replace(replaceRE, '')
-    }
-
-    if (searchOnline) {
-      fetchSearchSuggestions(frameProps.get('tabId'), autocompleteURL, input)
-    }
-  } else {
-    state = state.setIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'searchResults']), Immutable.fromJS([]))
-  }
-  return state
-}
-
-const setUrlSuggestions = (state, suggestionList) => {
-  if (suggestionList !== undefined) {
-    state = state.setIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'suggestionList']), suggestionList)
-  }
-  state = updateUrlSuffix(state, suggestionList)
-  return state
-}
-
-const setRenderUrlBarSuggestions = (state, enabled) => {
-  state = state.setIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'shouldRender']), enabled)
-  if (!enabled) {
-    state = state.mergeIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions']), {
-      selectedIndex: null,
-      suggestionList: null
-    })
-    // Make sure to remove the suffix from the url bar
-    state = state.setIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'selectedIndex']), null)
-    state = updateUrlSuffix(state, undefined)
-  }
-  return state
-}
-
-/**
- * Updates the active frame state with what the URL bar suffix should be.
- * @param suggestionList - The suggestion list to use to figure out the suffix.
- */
-const updateUrlSuffix = (state, suggestionList) => {
-  let selectedIndex = state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'selectedIndex'])) || 0
-  const lastSuffix = state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'urlSuffix']))
-  if (!selectedIndex && lastSuffix) {
-    selectedIndex = 0
-  }
-  const suggestion = suggestionList && suggestionList.get(selectedIndex)
-  let suffix = ''
-  if (suggestion) {
-    const autocompleteEnabled = state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'autocompleteEnabled']))
-
-    if (autocompleteEnabled) {
-      const location = state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'location']))
-      const index = suggestion.location.toLowerCase().indexOf(location.toLowerCase())
-      if (index !== -1) {
-        const beforePrefix = suggestion.location.substring(0, index)
-        if (beforePrefix.endsWith('://') || beforePrefix.endsWith('://www.') || index === 0) {
-          suffix = suggestion.location.substring(index + location.length)
-        }
-      }
-    }
-  }
-  state = state.setIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'urlSuffix']), suffix)
-  return state
-}
-
-const generateNewSuggestionsList = (state) => {
-  const activeFrameKey = state.get('activeFrameKey')
-  const urlLocation = state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'location']))
-  let sites = appStoreRenderer.state.get('sites')
-  if (sites) {
-    // Filter out Brave default newtab sites and sites with falsey location
-    sites = sites.filter((site) => !isDefaultEntry(site) && site.get('location'))
-  }
-  const searchResults = state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'searchResults']))
-  const frameSearchDetail = state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'searchDetail']))
-  const searchDetail = state.get('searchDetail')
-
-  if (!urlLocation) {
-    return state
-  }
-
-  const urlLocationLower = urlLocation.toLowerCase()
-  let suggestionsList = new Immutable.List()
-  const defaultme = (x) => x
-  const mapListToElements = ({data, maxResults, type, clickHandler = navigateSiteClickHandler.bind(this),
-      sortHandler = defaultme, formatTitle = defaultme, formatUrl = defaultme,
-      filterValue = (site) => {
-        return site.toLowerCase().includes(urlLocationLower)
-      }
-  }) => // Filter out things which are already in our own list at a smaller index
-    data
-    // Per suggestion provider filter
-    .filter(filterValue)
-    // Filter out things which are already in the suggestions list
-    .filter((site) =>
-      suggestionsList.findIndex((x) => (x.location || '').toLowerCase() === (formatUrl(site) || '').toLowerCase()) === -1 ||
-        // Tab autosuggestions should always be included since they will almost always be in history
-        type === suggestionTypes.TAB)
-    .sort(sortHandler)
-    .take(maxResults)
-    .map((site) => {
-      return {
-        onClick: clickHandler.bind(null, site),
-        title: formatTitle(site),
-        location: formatUrl(site),
-        type
-      }
-    })
-
-  const shouldNormalize = suggestion.shouldNormalizeLocation(urlLocationLower)
-  const urlLocationLowerNormalized = suggestion.normalizeLocation(urlLocationLower)
-  const sortBasedOnLocationPos = (s1, s2) => {
-    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) {
-      return 1
-    } else if (pos2 === -1) {
-      return -1
-    } else {
-      if (pos1 - pos2 !== 0) {
-        return pos1 - pos2
-      } else {
-        // sort site.com higher than site.com/somepath
-        const sdnv1 = suggestion.simpleDomainNameValue(s1)
-        const sdnv2 = suggestion.simpleDomainNameValue(s2)
-        if (sdnv1 !== sdnv2) {
-          return sdnv2 - sdnv1
-        } else {
-          // If there's a tie on the match location, use the age
-          // decay modified access count
-          return suggestion.sortByAccessCountWithAgeDecay(s1, s2)
-        }
-      }
-    }
-  }
-
-  const historyFilter = (site) => {
-    if (!site) {
-      return false
-    }
-    const title = site.get('title') || ''
-    const location = site.get('location') || ''
-    // Note: Bookmark sites are now included in history. This will allow
-    // sites to appear in the auto-complete regardless of their bookmark
-    // status. If history is turned off, bookmarked sites will appear
-    // in the bookmark section.
-    return (title.toLowerCase().includes(urlLocationLower) ||
-            location.toLowerCase().includes(urlLocationLower)) &&
-            site.get('lastAccessedTime')
-  }
-  var historySites = sites.filter(historyFilter)
-
-  // potentially append virtual history items (such as www.google.com when
-  // searches have been made but the root site has not been visited)
-  historySites = historySites.concat(suggestion.createVirtualHistoryItems(historySites))
-
-  // history
-  if (getSetting(settings.HISTORY_SUGGESTIONS)) {
-    suggestionsList = suggestionsList.concat(mapListToElements({
-      data: historySites,
-      maxResults: config.urlBarSuggestions.maxHistorySites,
-      type: suggestionTypes.HISTORY,
-      clickHandler: navigateSiteClickHandler((site) => {
-        return site.get('location')
-      }),
-      sortHandler: sortBasedOnLocationPos,
-      formatTitle: (site) => site.get('title'),
-      formatUrl: (site) => site.get('location'),
-      filterValue: historyFilter
-    }))
-  }
-
-  // bookmarks
-  if (getSetting(settings.BOOKMARK_SUGGESTIONS)) {
-    suggestionsList = suggestionsList.concat(mapListToElements({
-      data: sites,
-      maxResults: config.urlBarSuggestions.maxBookmarkSites,
-      type: suggestionTypes.BOOKMARK,
-      clickHandler: navigateSiteClickHandler((site) => {
-        return site.get('location')
-      }),
-      sortHandler: sortBasedOnLocationPos,
-      formatTitle: (site) => site.get('title'),
-      formatUrl: (site) => site.get('location'),
-      filterValue: (site) => {
-        const title = site.get('title') || ''
-        const location = site.get('location') || ''
-        return (title.toLowerCase().includes(urlLocationLower) ||
-          location.toLowerCase().includes(urlLocationLower)) &&
-          site.get('tags') && site.get('tags').includes(siteTags.BOOKMARK)
-      }
-    }))
-  }
-
-  // about pages
-  suggestionsList = suggestionsList.concat(mapListToElements({
-    data: aboutUrls.keySeq().filter((x) => isNavigatableAboutPage(x)),
-    maxResults: config.urlBarSuggestions.maxAboutPages,
-    type: suggestionTypes.ABOUT_PAGES,
-    clickHandler: navigateSiteClickHandler((x) => x)}))
-
-  // opened frames
-  if (getSetting(settings.OPENED_TAB_SUGGESTIONS)) {
-    suggestionsList = suggestionsList.concat(mapListToElements({
-      data: state.get('frames'),
-      maxResults: config.urlBarSuggestions.maxOpenedFrames,
-      type: suggestionTypes.TAB,
-      clickHandler: frameClickHandler,
-      sortHandler: sortBasedOnLocationPos,
-      formatTitle: (frame) => frame.get('title'),
-      formatUrl: (frame) => frame.get('location'),
-      filterValue: (frame) => !isSourceAboutUrl(frame.get('location')) &&
-        frame.get('key') !== activeFrameKey &&
-        (
-          (frame.get('title') && frame.get('title').toLowerCase().includes(urlLocationLower)) ||
-          (frame.get('location') && frame.get('location').toLowerCase().includes(urlLocationLower))
-        )
-    }))
-  }
-
-  // Search suggestions
-  if (getSetting(settings.OFFER_SEARCH_SUGGESTIONS) && searchResults) {
-    suggestionsList = suggestionsList.concat(mapListToElements({
-      data: searchResults,
-      maxResults: config.urlBarSuggestions.maxSearch,
-      type: suggestionTypes.SEARCH,
-      clickHandler: navigateSiteClickHandler((searchTerms) => {
-        let searchURL = frameSearchDetail
-        ? frameSearchDetail.get('search') : searchDetail.get('searchURL')
-        return searchURL.replace('{searchTerms}', encodeURIComponent(searchTerms))
-      })
-    }))
-  }
-
-  // Alexa top 500
-  suggestionsList = suggestionsList.concat(mapListToElements({
-    data: top500,
-    maxResults: config.urlBarSuggestions.maxTopSites,
-    type: suggestionTypes.TOP_SITE,
-    clickHandler: navigateSiteClickHandler((x) => x)}))
-
-  return setUrlSuggestions(state, suggestionsList)
-}
-
-const urlBarSuggestionsReducer = (state, action) => {
-  switch (action.actionType) {
-    case windowConstants.WINDOW_SET_NAVIGATED:
-      const key = action.key || state.get('activeFrameKey')
-      state = state.setIn(frameStatePath(state, key).concat(['navbar', 'urlbar', 'suggestions', 'shouldRender']), false)
-      const frame = getFrameByKey(state, key)
-      state = updateSearchEngineInfoFromInput(state, frame)
-      break
-    case windowConstants.WINDOW_SET_FINDBAR_SHOWN:
-      if (action.shown) {
-        state = state.setIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'shouldRender']), false)
-      }
-      break
-    case windowConstants.WINDOW_PREVIOUS_URL_BAR_SUGGESTION_SELECTED: {
-      const selectedIndexPath = activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'selectedIndex'])
-      const suggestionList = state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'suggestionList']))
-      const selectedIndex = state.getIn(selectedIndexPath)
-      const lastSuffix = state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'urlSuffix']))
-      if (!selectedIndex && selectedIndex !== 0 && !lastSuffix) {
-        state = state.setIn(selectedIndexPath, 0)
-      } else if (selectedIndex > 0) {
-        state = state.setIn(selectedIndexPath, selectedIndex - 1)
-      } else {
-        state = state.setIn(selectedIndexPath, suggestionList.size - 1)
-      }
-      state = updateUrlSuffix(state, state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'suggestionList']), suggestionList))
-      break
-    }
-    case windowConstants.WINDOW_NEXT_URL_BAR_SUGGESTION_SELECTED: {
-      const selectedIndexPath = activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'selectedIndex'])
-      const suggestionList = state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'suggestionList']))
-      const selectedIndex = state.getIn(selectedIndexPath)
-      const lastSuffix = state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'urlSuffix']))
-      if (!selectedIndex && selectedIndex !== 0 && !lastSuffix) {
-        state = state.setIn(selectedIndexPath, 0)
-      } else if (selectedIndex < suggestionList.size - 1) {
-        state = state.setIn(selectedIndexPath, selectedIndex + 1)
-      } else if (selectedIndex === suggestionList.size - 1) {
-        state = state.setIn(selectedIndexPath, 0)
-      }
-      state = updateUrlSuffix(state, state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'suggestionList']), suggestionList))
-      break
-    }
-    case windowConstants.WINDOW_SEARCH_SUGGESTION_RESULTS_AVAILABLE:
-      const frameKey = getFrameKeyByTabId(state, action.tabId)
-      state = state.setIn(frameStatePath(state, frameKey).concat(['navbar', 'urlbar', 'suggestions', 'searchResults']), action.searchResults)
-      state = generateNewSuggestionsList(state)
-      break
-    case windowConstants.WINDOW_SET_NAVBAR_INPUT:
-      const activeFrameProps = getActiveFrame(state)
-      state = updateSearchEngineInfoFromInput(state, activeFrameProps)
-      state = searchXHR(state, activeFrameProps, true)
-      state = generateNewSuggestionsList(state)
-      state = updateUrlSuffix(state, state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'suggestionList']), action.suggestionList))
-      if (!action.location) {
-        state = setRenderUrlBarSuggestions(state, false)
-      }
-      break
-    case windowConstants.WINDOW_URL_BAR_AUTOCOMPLETE_ENABLED:
-      state = state.setIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'autocompleteEnabled']), action.enabled)
-      break
-    case windowConstants.WINDOW_SET_URL_BAR_SUGGESTIONS:
-      state = state.setIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'selectedIndex']), action.selectedIndex)
-      state = setUrlSuggestions(state, action.suggestionList)
-      break
-    case windowConstants.WINDOW_SET_URL_BAR_ACTIVE:
-      state = state.setIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'active']), action.isActive)
-      if (!action.isActive) {
-        state = state.setIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'shouldRender']), false)
-        state = state.mergeIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions']), {
-          selectedIndex: null,
-          suggestionList: null
-        })
-      }
-      break
-    case windowConstants.WINDOW_SET_RENDER_URL_BAR_SUGGESTIONS:
-      state = setRenderUrlBarSuggestions(state, action.enabled)
-      break
-    case windowConstants.WINDOW_ACTIVE_URL_BAR_SUGGESTION_CLICKED:
-      const selectedIndex = state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'selectedIndex'])) || 0
-      const suggestionList = state.getIn(activeFrameStatePath(state).concat(['navbar', 'urlbar', 'suggestions', 'suggestionList']))
-      if (suggestionList.size > 0) {
-        // It's important this doesn't run sync or else the returned state below will overwrite anything done in the click handler
-        setImmediate(() =>
-          suggestionList.get(selectedIndex).onClick(action.isForSecondaryAction, action.shiftKey))
-      }
-      break
-    default:
-      return state
-  }
-  return state
-}
-
-module.exports = urlBarSuggestionsReducer
diff --git a/docs/windowActions.md b/docs/windowActions.md
index ede16180fba..07641c55d4d 100644
--- a/docs/windowActions.md
+++ b/docs/windowActions.md
@@ -415,16 +415,6 @@ are no autocomplete results.
 
 
 
-### setUrlBarFocused(isFocused) 
-
-Marks the URL bar as focused or not.
-
-**Parameters**
-
-**isFocused**: `boolean`, Whether or not the URL bar should be marked as focused
-
-
-
 ### frameShortcutChanged(frameProps, activeShortcut, activeShortcutDetails) 
 
 Dispatches a message to the store to indicate that the pending frame shortcut info should be updated.
diff --git a/js/actions/windowActions.js b/js/actions/windowActions.js
index dd834342ad6..75819575623 100644
--- a/js/actions/windowActions.js
+++ b/js/actions/windowActions.js
@@ -502,17 +502,30 @@ const windowActions = {
     })
   },
 
-  /**
-   * Marks the URL bar as focused or not.
-   *
-   * @param {boolean} isFocused - Whether or not the URL bar should be marked as focused
-   */
-  setUrlBarFocused: function (isFocused) {
+  urlBarOnFocus: function (windowId) {
     dispatch({
-      actionType: windowConstants.WINDOW_SET_URL_BAR_FOCUSED,
-      isFocused
+      actionType: windowConstants.WINDOW_URL_BAR_ON_FOCUS,
+      windowId
     })
   },
+
+  urlBarOnBlur: function (windowId, targetValue, locationValue, fromSuggestion) {
+    dispatch({
+      actionType: windowConstants.WINDOW_URL_BAR_ON_BLUR,
+      windowId,
+      targetValue,
+      locationValue,
+      fromSuggestion
+    })
+  },
+
+  tabOnFocus: function (tabId) {
+    dispatch({
+      actionType: windowConstants.WINDOW_TAB_ON_FOCUS,
+      tabId
+    })
+  },
+
   /**
    * Dispatches a message to the store to indicate that the pending frame shortcut info should be updated.
    *
diff --git a/js/components/frame.js b/js/components/frame.js
index 2d679418c73..6cd3792f60e 100644
--- a/js/components/frame.js
+++ b/js/components/frame.js
@@ -901,13 +901,9 @@ class Frame extends ImmutableComponent {
   onFocus () {
     if (!this.frame.isEmpty()) {
       windowActions.setTabPageIndexByFrame(this.frame)
+      windowActions.tabOnFocus(this.frame.get('tabId'))
     }
 
-    // Make sure urlBar focused state is updated so that on tab
-    // changes the focus state doesn't go back to the urlBar
-    windowActions.setUrlBarFocused(false)
-    windowActions.setUrlBarActive(false)
-
     windowActions.setContextMenuDetail()
     windowActions.setPopupWindowDetail()
   }
diff --git a/js/constants/windowConstants.js b/js/constants/windowConstants.js
index b67fdcf97a2..da8ef1d55db 100644
--- a/js/constants/windowConstants.js
+++ b/js/constants/windowConstants.js
@@ -42,8 +42,10 @@ const windowConstants = {
   WINDOW_UNDO_CLOSED_FRAME: _,
   WINDOW_CLEAR_CLOSED_FRAMES: _,
   WINDOW_FRAME_SHORTCUT_CHANGED: _,
+  WINDOW_URL_BAR_ON_BLUR: _,
+  WINDOW_URL_BAR_ON_FOCUS: _,
+  WINDOW_TAB_ON_FOCUS: _,
   WINDOW_SET_URL_BAR_SELECTED: _,
-  WINDOW_SET_URL_BAR_FOCUSED: _,
   WINDOW_SET_SEARCH_DETAIL: _,
   WINDOW_SET_FIND_DETAIL: _,
   WINDOW_SET_BOOKMARK_DETAIL: _, // If set, also indicates that add/edit is shown
diff --git a/js/stores/windowStore.js b/js/stores/windowStore.js
index 9ac7c050a93..75d9bd218e9 100644
--- a/js/stores/windowStore.js
+++ b/js/stores/windowStore.js
@@ -248,7 +248,6 @@ const emitChanges = debounce(windowStore.emitChanges.bind(windowStore), 5)
 
 const applyReducers = (state, action) => [
   require('../../app/renderer/reducers/urlBarReducer'),
-  require('../../app/renderer/reducers/urlBarSuggestionsReducer'),
   require('../../app/renderer/reducers/frameReducer'),
   require('../../app/renderer/reducers/contextMenuReducer')
 ].reduce(
@@ -440,19 +439,6 @@ const doAction = (action) => {
         windowState = windowState.setIn(tabStatePathForFrame(windowState, action.frameProps).concat(['computedThemeColor']), action.computedThemeColor)
       }
       break
-    case windowConstants.WINDOW_SET_URL_BAR_FOCUSED:
-      windowState = windowState.setIn(activeFrameStatePath(windowState).concat(['navbar', 'urlbar', 'focused']), action.isFocused)
-      break
-    case windowConstants.WINDOW_SET_URL_BAR_SELECTED:
-      const urlBarPath = activeFrameStatePath(windowState).concat(['navbar', 'urlbar'])
-      windowState = windowState.mergeIn(urlBarPath, {
-        selected: action.selected
-      })
-      // selection implies focus
-      if (action.selected) {
-        windowState = windowState.setIn(activeFrameStatePath(windowState).concat(['navbar', 'urlbar', 'focused']), true)
-      }
-      break
     case windowConstants.WINDOW_FRAME_SHORTCUT_CHANGED:
       const framePath = action.frameProps ? ['frames', frameStateUtil.getFramePropsIndex(frameStateUtil.getFrames(windowState), action.frameProps)] : activeFrameStatePath(windowState)
       windowState = windowState.mergeIn(framePath, {
diff --git a/test/unit/app/common/state/frameStateTest.js b/test/unit/app/common/state/frameStateTest.js
index f65bb9deb08..6b9dcd48954 100644
--- a/test/unit/app/common/state/frameStateTest.js
+++ b/test/unit/app/common/state/frameStateTest.js
@@ -92,7 +92,7 @@ describe('frameState', function () {
 
     it('returns null if the frame for `tabId` does not exist', function () {
       const path = frameState.getPathByTabId(this.windowState, 3)
-      assert.deepEqual(path.toJS(), ['nosuchframe'])
+      assert.equal(path, null)
     })
 
     shouldValidateId('tabId', (tabId) => {
diff --git a/test/unit/app/renderer/reducers/urlBarReducerTest.js b/test/unit/app/renderer/reducers/urlBarReducerTest.js
index 982eab054e4..1a5d7ec7870 100644
--- a/test/unit/app/renderer/reducers/urlBarReducerTest.js
+++ b/test/unit/app/renderer/reducers/urlBarReducerTest.js
@@ -9,6 +9,7 @@ require('../../../braveUnit')
 
 const windowState = Immutable.fromJS({
   activeFrameKey: 2,
+  searchDetail: {},
   frames: [{
     key: 1,
     tabId: 1,
@@ -42,6 +43,47 @@ const windowState = Immutable.fromJS({
   }]
 })
 
+const fakeAppStoreRenderer = {
+  state: Immutable.fromJS({
+    sites: {
+      'key1': {
+        location: 'location1',
+        tags: [],
+        lastAccessedTime: 123
+      },
+      'key2': {
+        location: 'location2',
+        tags: [],
+        lastAccessedTime: 123
+      },
+      'key3': {
+        title: 'about:newtab',
+        location: undefined,
+        tags: [],
+        lastAccessedTime: 123
+      },
+      'key4': {
+        location: 'http://www.foo.com/1',
+        count: 0,
+        lastAccessedTime: 1,
+        title: 'www.foo/com/1'
+      },
+      'key5': {
+        location: 'http://www.foo.com/2',
+        count: 0,
+        lastAccessedTime: 2,
+        title: 'www.foo/com/2'
+      },
+      'key6': {
+        location: 'http://www.foo.com/3',
+        count: 0,
+        lastAccessedTime: 3,
+        title: 'www.foo/com/3'
+      }
+    }
+  })
+}
+
 describe('urlBarReducer', function () {
   let urlBarReducer
   before(function () {
@@ -51,6 +93,7 @@ describe('urlBarReducer', function () {
       useCleanCache: true
     })
     mockery.registerMock('electron', fakeElectron)
+    mockery.registerMock('../../../js/stores/appStoreRenderer', fakeAppStoreRenderer)
     urlBarReducer = require('../../../../../app/renderer/reducers/urlBarReducer')
   })
   after(function () {
@@ -140,4 +183,141 @@ describe('urlBarReducer', function () {
       assert.equal(this.newState.getIn(['frames', 0, 'location']), action.location)
     })
   })
+
+  describe('suggestions', function () {
+    let urlBarReducer
+    const windowState = Immutable.fromJS({
+      activeFrameKey: 2,
+      frames: [{
+        key: 1
+      }, {
+        tabId: 2,
+        key: 2,
+        location: 'https://www.brave.com',
+        navbar: {
+          urlbar: {
+            location: 'about:newtab',
+            suggestions: {
+              shouldRender: true,
+              selectedIndex: 2,
+              suggestionList: ['2.71828', '18284', '59045', '23536'],
+              searchResults: [
+                '3.1415926535'
+              ]
+            }
+          }
+        }
+      }, {
+        key: 3,
+        location: 'about:newtab'
+      }]
+    })
+
+    before(function () {
+      mockery.enable({
+        warnOnReplace: false,
+        warnOnUnregistered: false,
+        useCleanCache: true
+      })
+      mockery.registerMock('electron', fakeElectron)
+      mockery.registerMock('../../../js/stores/appStoreRenderer', fakeAppStoreRenderer)
+      mockery.registerMock('../../../js/settings', { getSetting: (settingKey, settingsCollection, value) => {
+        switch (settingKey) {
+          default: return true
+        }
+      }})
+      urlBarReducer = require('../../../../../app/renderer/reducers/urlBarReducer')
+    })
+
+    after(function () {
+      mockery.disable()
+    })
+
+    describe('WINDOW_SET_NAVIGATED', function () {
+      it('turns off suggestions', function () {
+        const newState = urlBarReducer(windowState, {actionType: windowConstants.WINDOW_SET_NAVIGATED, location: 'http://brave.com'})
+        assert.equal(newState.getIn(['frames', 1, 'navbar', 'urlbar', 'suggestions', 'shouldRender']), false)
+      })
+    })
+
+    describe('WINDOW_SET_FINDBAR_SHOWN', function () {
+      it('turns off suggestions', function () {
+        const newState = urlBarReducer(windowState, {actionType: windowConstants.WINDOW_SET_FINDBAR_SHOWN, shown: true})
+        assert.equal(newState.getIn(['frames', 1, 'navbar', 'urlbar', 'suggestions', 'shouldRender']), false)
+      })
+    })
+
+    describe('WINDOW_PREVIOUS_URL_BAR_SUGGESTION_SELECTED', function () {
+      it('turns off suggestions', function () {
+        const newState = urlBarReducer(windowState, {actionType: windowConstants.WINDOW_PREVIOUS_URL_BAR_SUGGESTION_SELECTED})
+        assert.equal(newState.getIn(['frames', 1, 'navbar', 'urlbar', 'suggestions', 'selectedIndex']), 1)
+      })
+    })
+
+    describe('WINDOW_NEXT_URL_BAR_SUGGESTION_SELECTED', function () {
+      it('turns off suggestions', function () {
+        const newState = urlBarReducer(windowState, {actionType: windowConstants.WINDOW_NEXT_URL_BAR_SUGGESTION_SELECTED})
+        assert.equal(newState.getIn(['frames', 1, 'navbar', 'urlbar', 'suggestions', 'selectedIndex']), 3)
+      })
+    })
+
+    describe('WINDOW_SEARCH_SUGGESTION_RESULTS_AVAILABLE', function () {
+      it('turns off suggestions', function () {
+        const searchResults = Immutable.fromJS(['0110001001110010011010010110000101101110'])
+        const newState = urlBarReducer(windowState, {actionType: windowConstants.WINDOW_SEARCH_SUGGESTION_RESULTS_AVAILABLE, searchResults, tabId: 2})
+        assert.deepEqual(newState.getIn(['frames', 1, 'navbar', 'urlbar', 'suggestions', 'searchResults']).toJS(), searchResults.toJS())
+      })
+    })
+
+    describe('WINDOW_SET_NAVBAR_INPUT', function () {
+      // TODO
+    })
+
+    describe('WINDOW_URL_BAR_AUTOCOMPLETE_ENABLED', function () {
+      it('state is toggled', function () {
+        const newState = urlBarReducer(windowState, {actionType: windowConstants.WINDOW_URL_BAR_AUTOCOMPLETE_ENABLED, enabled: false})
+        assert.equal(newState.getIn(['frames', 1, 'navbar', 'urlbar', 'suggestions', 'autocompleteEnabled']), false)
+      })
+    })
+
+    describe('WINDOW_SET_URL_BAR_SUGGESTIONS', function () {
+      it('suggestion results can be updated', function () {
+        const suggestionList = Immutable.fromJS(['0.207879576'])
+        const newState = urlBarReducer(windowState, {actionType: windowConstants.WINDOW_SET_URL_BAR_SUGGESTIONS, suggestionList, selectedIndex: null})
+        assert.equal(newState.getIn(['frames', 1, 'navbar', 'urlbar', 'suggestions', 'suggestionList']), suggestionList)
+        assert.equal(newState.getIn(['frames', 1, 'navbar', 'urlbar', 'suggestions', 'selectedIndex']), null)
+      })
+    })
+
+    describe('WINDOW_SET_URL_BAR_ACTIVE', function () {
+      it('active state can be toggled', function () {
+        let newState = urlBarReducer(windowState, {actionType: windowConstants.WINDOW_SET_URL_BAR_ACTIVE, isActive: true})
+        assert.equal(newState.getIn(['frames', 1, 'navbar', 'urlbar', 'active']), true)
+        newState = urlBarReducer(windowState, {actionType: windowConstants.WINDOW_SET_URL_BAR_ACTIVE, isActive: false})
+        assert.equal(newState.getIn(['frames', 1, 'navbar', 'urlbar', 'suggestions', 'shouldRender']), false)
+        assert.equal(newState.getIn(['frames', 1, 'navbar', 'urlbar', 'suggestions', 'selectedIndex']), null)
+        assert.equal(newState.getIn(['frames', 1, 'navbar', 'urlbar', 'suggestions', 'suggestionList']), null)
+      })
+    })
+
+    describe('WINDOW_SET_RENDER_URL_BAR_SUGGESTIONS', function () {
+      it('turns off suggestions for not enabled', function () {
+        const newState = urlBarReducer(windowState, {actionType: windowConstants.WINDOW_SET_RENDER_URL_BAR_SUGGESTIONS, enabled: false})
+        assert.equal(newState.getIn(['frames', 1, 'navbar', 'urlbar', 'suggestions', 'shouldRender']), false)
+      })
+      it('turns on suggestions for enabled', function () {
+        let newState = urlBarReducer(windowState, {actionType: windowConstants.WINDOW_SET_RENDER_URL_BAR_SUGGESTIONS, enabled: false})
+        newState = urlBarReducer(newState, {actionType: windowConstants.WINDOW_SET_RENDER_URL_BAR_SUGGESTIONS, enabled: true})
+        assert.equal(newState.getIn(['frames', 1, 'navbar', 'urlbar', 'suggestions', 'shouldRender']), true)
+      })
+    })
+
+    describe('WINDOW_ACTIVE_URL_BAR_SUGGESTION_CLICKED', function () {
+      it('', function (cb) {
+        const inputState = windowState.setIn(['frames', 1, 'navbar', 'urlbar', 'suggestions', 'suggestionList', 2], {onClick: cb})
+        // Thiis test will finish when the callback is called from the click event
+        urlBarReducer(inputState, {actionType: windowConstants.WINDOW_ACTIVE_URL_BAR_SUGGESTION_CLICKED})
+      })
+    })
+  })
 })
diff --git a/test/unit/app/renderer/reducers/urlBarSuggestionsReducerTest.js b/test/unit/app/renderer/reducers/urlBarSuggestionsReducerTest.js
deleted file mode 100644
index 6127ba09353..00000000000
--- a/test/unit/app/renderer/reducers/urlBarSuggestionsReducerTest.js
+++ /dev/null
@@ -1,186 +0,0 @@
-/* global describe, it, before, after */
-const mockery = require('mockery')
-const Immutable = require('immutable')
-const assert = require('assert')
-const fakeElectron = require('../../../lib/fakeElectron')
-
-const windowConstants = require('../../../../../js/constants/windowConstants')
-require('../../../braveUnit')
-
-const windowState = Immutable.fromJS({
-  activeFrameKey: 2,
-  frames: [{
-    key: 1
-  }, {
-    tabId: 2,
-    key: 2,
-    location: 'https://www.brave.com',
-    navbar: {
-      urlbar: {
-        location: 'about:newtab',
-        suggestions: {
-          shouldRender: true,
-          selectedIndex: 2,
-          suggestionList: ['2.71828', '18284', '59045', '23536'],
-          searchResults: [
-            '3.1415926535'
-          ]
-        }
-      }
-    }
-  }, {
-    key: 3,
-    location: 'about:newtab'
-  }]
-})
-
-const fakeAppStoreRenderer = {
-  state: Immutable.fromJS({
-    sites: {
-      'key1': {
-        location: 'location1',
-        tags: [],
-        lastAccessedTime: 123
-      },
-      'key2': {
-        location: 'location2',
-        tags: [],
-        lastAccessedTime: 123
-      },
-      'key3': {
-        title: 'about:newtab',
-        location: undefined,
-        tags: [],
-        lastAccessedTime: 123
-      },
-      'key4': {
-        location: 'http://www.foo.com/1',
-        count: 0,
-        lastAccessedTime: 1,
-        title: 'www.foo/com/1'
-      },
-      'key5': {
-        location: 'http://www.foo.com/2',
-        count: 0,
-        lastAccessedTime: 2,
-        title: 'www.foo/com/2'
-      },
-      'key6': {
-        location: 'http://www.foo.com/3',
-        count: 0,
-        lastAccessedTime: 3,
-        title: 'www.foo/com/3'
-      }
-    }
-  })
-}
-
-describe('urlBarSuggestionsReducer unit tests', function () {
-  let urlBarSuggestionsReducer
-  before(function () {
-    mockery.enable({
-      warnOnReplace: false,
-      warnOnUnregistered: false,
-      useCleanCache: true
-    })
-    mockery.registerMock('electron', fakeElectron)
-    mockery.registerMock('../../../js/stores/appStoreRenderer', fakeAppStoreRenderer)
-    mockery.registerMock('../../../js/settings', { getSetting: (settingKey, settingsCollection, value) => {
-      switch (settingKey) {
-        default: return true
-      }
-    }})
-    urlBarSuggestionsReducer = require('../../../../../app/renderer/reducers/urlBarSuggestionsReducer')
-  })
-
-  after(function () {
-    mockery.disable()
-  })
-
-  describe('WINDOW_SET_NAVIGATED', function () {
-    it('turns off suggestions', function () {
-      const newState = urlBarSuggestionsReducer(windowState, {actionType: windowConstants.WINDOW_SET_NAVIGATED})
-      assert.equal(newState.getIn(['frames', 1, 'navbar', 'urlbar', 'suggestions', 'shouldRender']), false)
-    })
-  })
-
-  describe('WINDOW_SET_FINDBAR_SHOWN', function () {
-    it('turns off suggestions', function () {
-      const newState = urlBarSuggestionsReducer(windowState, {actionType: windowConstants.WINDOW_SET_FINDBAR_SHOWN, shown: true})
-      assert.equal(newState.getIn(['frames', 1, 'navbar', 'urlbar', 'suggestions', 'shouldRender']), false)
-    })
-  })
-
-  describe('WINDOW_PREVIOUS_URL_BAR_SUGGESTION_SELECTED', function () {
-    it('turns off suggestions', function () {
-      const newState = urlBarSuggestionsReducer(windowState, {actionType: windowConstants.WINDOW_PREVIOUS_URL_BAR_SUGGESTION_SELECTED})
-      assert.equal(newState.getIn(['frames', 1, 'navbar', 'urlbar', 'suggestions', 'selectedIndex']), 1)
-    })
-  })
-
-  describe('WINDOW_NEXT_URL_BAR_SUGGESTION_SELECTED', function () {
-    it('turns off suggestions', function () {
-      const newState = urlBarSuggestionsReducer(windowState, {actionType: windowConstants.WINDOW_NEXT_URL_BAR_SUGGESTION_SELECTED})
-      assert.equal(newState.getIn(['frames', 1, 'navbar', 'urlbar', 'suggestions', 'selectedIndex']), 3)
-    })
-  })
-
-  describe('WINDOW_SEARCH_SUGGESTION_RESULTS_AVAILABLE', function () {
-    it('turns off suggestions', function () {
-      const searchResults = Immutable.fromJS(['0110001001110010011010010110000101101110'])
-      const newState = urlBarSuggestionsReducer(windowState, {actionType: windowConstants.WINDOW_SEARCH_SUGGESTION_RESULTS_AVAILABLE, searchResults, tabId: 2})
-      assert.deepEqual(newState.getIn(['frames', 1, 'navbar', 'urlbar', 'suggestions', 'searchResults']).toJS(), searchResults.toJS())
-    })
-  })
-
-  describe('WINDOW_SET_NAVBAR_INPUT', function () {
-    // TODO
-  })
-
-  describe('WINDOW_URL_BAR_AUTOCOMPLETE_ENABLED', function () {
-    it('state is toggled', function () {
-      const newState = urlBarSuggestionsReducer(windowState, {actionType: windowConstants.WINDOW_URL_BAR_AUTOCOMPLETE_ENABLED, enabled: false})
-      assert.equal(newState.getIn(['frames', 1, 'navbar', 'urlbar', 'suggestions', 'autocompleteEnabled']), false)
-    })
-  })
-
-  describe('WINDOW_SET_URL_BAR_SUGGESTIONS', function () {
-    it('suggestion results can be updated', function () {
-      const suggestionList = Immutable.fromJS(['0.207879576'])
-      const newState = urlBarSuggestionsReducer(windowState, {actionType: windowConstants.WINDOW_SET_URL_BAR_SUGGESTIONS, suggestionList, selectedIndex: null})
-      assert.equal(newState.getIn(['frames', 1, 'navbar', 'urlbar', 'suggestions', 'suggestionList']), suggestionList)
-      assert.equal(newState.getIn(['frames', 1, 'navbar', 'urlbar', 'suggestions', 'selectedIndex']), null)
-    })
-  })
-
-  describe('WINDOW_SET_URL_BAR_ACTIVE', function () {
-    it('active state can be toggled', function () {
-      let newState = urlBarSuggestionsReducer(windowState, {actionType: windowConstants.WINDOW_SET_URL_BAR_ACTIVE, isActive: true})
-      assert.equal(newState.getIn(['frames', 1, 'navbar', 'urlbar', 'active']), true)
-      newState = urlBarSuggestionsReducer(windowState, {actionType: windowConstants.WINDOW_SET_URL_BAR_ACTIVE, isActive: false})
-      assert.equal(newState.getIn(['frames', 1, 'navbar', 'urlbar', 'suggestions', 'shouldRender']), false)
-      assert.equal(newState.getIn(['frames', 1, 'navbar', 'urlbar', 'suggestions', 'selectedIndex']), null)
-      assert.equal(newState.getIn(['frames', 1, 'navbar', 'urlbar', 'suggestions', 'suggestionList']), null)
-    })
-  })
-
-  describe('WINDOW_SET_RENDER_URL_BAR_SUGGESTIONS', function () {
-    it('turns off suggestions for not enabled', function () {
-      const newState = urlBarSuggestionsReducer(windowState, {actionType: windowConstants.WINDOW_SET_RENDER_URL_BAR_SUGGESTIONS, enabled: false})
-      assert.equal(newState.getIn(['frames', 1, 'navbar', 'urlbar', 'suggestions', 'shouldRender']), false)
-    })
-    it('turns on suggestions for enabled', function () {
-      let newState = urlBarSuggestionsReducer(windowState, {actionType: windowConstants.WINDOW_SET_RENDER_URL_BAR_SUGGESTIONS, enabled: false})
-      newState = urlBarSuggestionsReducer(newState, {actionType: windowConstants.WINDOW_SET_RENDER_URL_BAR_SUGGESTIONS, enabled: true})
-      assert.equal(newState.getIn(['frames', 1, 'navbar', 'urlbar', 'suggestions', 'shouldRender']), true)
-    })
-  })
-
-  describe('WINDOW_ACTIVE_URL_BAR_SUGGESTION_CLICKED', function () {
-    it('', function (cb) {
-      const inputState = windowState.setIn(['frames', 1, 'navbar', 'urlbar', 'suggestions', 'suggestionList', 2], {onClick: cb})
-      // Thiis test will finish when the callback is called from the click event
-      urlBarSuggestionsReducer(inputState, {actionType: windowConstants.WINDOW_ACTIVE_URL_BAR_SUGGESTION_CLICKED})
-    })
-  })
-})