Moved url bar related files into app folder

Resolves #8188

Auditors: @bridiver

Test Plan:
- all test should be green

js/components/navigationBar.js → app/renderer/components/navigation/navigationBar.js

@@ -4,27 +4,27 @@
 
 const React = require('react')
 const Immutable = require('immutable')
-const ImmutableComponent = require('./immutableComponent')
+const ImmutableComponent = require('./../../../../js/components/immutableComponent')
 
-const cx = require('../lib/classSet')
-const Button = require('./button')
-const UrlBar = require('../../app/renderer/components/urlBar')
-const windowActions = require('../actions/windowActions')
-const appActions = require('../actions/appActions')
-const siteTags = require('../constants/siteTags')
-const messages = require('../constants/messages')
-const settings = require('../constants/settings')
+const cx = require('../../../../js/lib/classSet')
+const Button = require('./../../../../js/components/button')
+const UrlBar = require('./urlBar')
+const windowActions = require('../../../../js/actions/windowActions')
+const appActions = require('../../../../js/actions/appActions')
+const siteTags = require('../../../../js/constants/siteTags')
+const messages = require('../../../../js/constants/messages')
+const settings = require('../../../../js/constants/settings')
 const ipc = require('electron').ipcRenderer
-const {isSourceAboutUrl, getBaseUrl} = require('../lib/appUrlUtil')
-const AddEditBookmarkHanger = require('../../app/renderer/components/addEditBookmarkHanger')
-const siteUtil = require('../state/siteUtil')
-const eventUtil = require('../lib/eventUtil')
-const UrlUtil = require('../lib/urlutil')
-const getSetting = require('../settings').getSetting
-const windowStore = require('../stores/windowStore')
-const contextMenus = require('../contextMenus')
-const LongPressButton = require('./longPressButton')
-const PublisherToggle = require('../../app/renderer/components/publisherToggle')
+const {isSourceAboutUrl, getBaseUrl} = require('../../../../js/lib/appUrlUtil')
+const AddEditBookmarkHanger = require('../addEditBookmarkHanger')
+const siteUtil = require('../../../../js/state/siteUtil')
+const eventUtil = require('../../../../js/lib/eventUtil')
+const UrlUtil = require('../../../../js/lib/urlutil')
+const getSetting = require('../../../../js/settings').getSetting
+const windowStore = require('../../../../js/stores/windowStore')
+const contextMenus = require('../../../../js/contextMenus')
+const LongPressButton = require('./../../../../js/components/longPressButton')
+const PublisherToggle = require('../publisherToggle')
 
 class NavigationBar extends ImmutableComponent {
   constructor () {

app/renderer/components/urlBar.js → app/renderer/components/navigation/urlBar.js

@@ -3,26 +3,26 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const React = require('react')
-const urlParse = require('../../common/urlParse')
-
-const ImmutableComponent = require('../../../js/components/immutableComponent')
-const windowActions = require('../../../js/actions/windowActions')
-const appActions = require('../../../js/actions/appActions')
-const KeyCodes = require('../../common/constants/keyCodes')
-const cx = require('../../../js/lib/classSet')
-const debounce = require('../../../js/lib/debounce')
+const urlParse = require('../../../common/urlParse')
+
+const ImmutableComponent = require('../../../../js/components/immutableComponent')
+const windowActions = require('../../../../js/actions/windowActions')
+const appActions = require('../../../../js/actions/appActions')
+const KeyCodes = require('../../../common/constants/keyCodes')
+const cx = require('../../../../js/lib/classSet')
+const debounce = require('../../../../js/lib/debounce')
 const ipc = require('electron').ipcRenderer
 
 const UrlBarSuggestions = require('./urlBarSuggestions')
 const UrlBarIcon = require('./urlBarIcon')
-const messages = require('../../../js/constants/messages')
-const {getSetting} = require('../../../js/settings')
-const settings = require('../../../js/constants/settings')
-const contextMenus = require('../../../js/contextMenus')
-const windowStore = require('../../../js/stores/windowStore')
-const UrlUtil = require('../../../js/lib/urlutil')
-const {eventElHasAncestorWithClasses, isForSecondaryAction} = require('../../../js/lib/eventUtil')
-const {isUrl, isIntermediateAboutPage} = require('../../../js/lib/appUrlUtil')
+const messages = require('../../../../js/constants/messages')
+const {getSetting} = require('../../../../js/settings')
+const settings = require('../../../../js/constants/settings')
+const contextMenus = require('../../../../js/contextMenus')
+const windowStore = require('../../../../js/stores/windowStore')
+const UrlUtil = require('../../../../js/lib/urlutil')
+const {eventElHasAncestorWithClasses, isForSecondaryAction} = require('../../../../js/lib/eventUtil')
+const {isUrl, isIntermediateAboutPage} = require('../../../../js/lib/appUrlUtil')
 
 class UrlBar extends ImmutableComponent {
   constructor () {
@@ -104,7 +104,7 @@ class UrlBar extends ImmutableComponent {
   getPlatformClientId (provider) {
     try {
       if (provider.get('platformClientId')) {
-        const platformUtil = require('../../common/lib/platformUtil')
+        const platformUtil = require('../../../common/lib/platformUtil')
         if (platformUtil.isWindows()) {
           return provider.getIn(['platformClientId', 'win32']) || ''
         } else if (platformUtil.isDarwin()) {

app/renderer/components/urlBarIcon.js → app/renderer/components/navigation/urlBarIcon.js

@@ -3,15 +3,15 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const React = require('react')
-const ImmutableComponent = require('../../../js/components/immutableComponent')
-const windowActions = require('../../../js/actions/windowActions')
-const cx = require('../../../js/lib/classSet')
-const dragTypes = require('../../../js/constants/dragTypes')
-const dndData = require('../../../js/dndData')
-const {isSourceAboutUrl} = require('../../../js/lib/appUrlUtil')
-const {isPotentialPhishingUrl} = require('../../../js/lib/urlutil')
-const windowStore = require('../../../js/stores/windowStore')
-const {getActiveFrame} = require('../../../js/state/frameStateUtil')
+const ImmutableComponent = require('../../../../js/components/immutableComponent')
+const windowActions = require('../../../../js/actions/windowActions')
+const cx = require('../../../../js/lib/classSet')
+const dragTypes = require('../../../../js/constants/dragTypes')
+const dndData = require('../../../../js/dndData')
+const {isSourceAboutUrl} = require('../../../../js/lib/appUrlUtil')
+const {isPotentialPhishingUrl} = require('../../../../js/lib/urlutil')
+const windowStore = require('../../../../js/stores/windowStore')
+const {getActiveFrame} = require('../../../../js/state/frameStateUtil')
 const searchIconSize = 16
 
 class UrlBarIcon extends ImmutableComponent {

app/renderer/components/urlBarSuggestionItem.js → app/renderer/components/navigation/urlBarSuggestionItem.js

@@ -3,9 +3,9 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const React = require('react')
-const ImmutableComponent = require('../../../js/components/immutableComponent')
-const suggestionTypes = require('../../../js/constants/suggestionTypes')
-const cx = require('../../../js/lib/classSet')
+const ImmutableComponent = require('../../../../js/components/immutableComponent')
+const suggestionTypes = require('../../../../js/constants/suggestionTypes')
+const cx = require('../../../../js/lib/classSet')
 
 class UrlBarSuggestionItem extends ImmutableComponent {
   componentDidMount () {

app/renderer/components/urlBarSuggestions.js → app/renderer/components/navigation/urlBarSuggestions.js

@@ -3,14 +3,14 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const React = require('react')
-const ImmutableComponent = require('../../../js/components/immutableComponent')
+const ImmutableComponent = require('../../../../js/components/immutableComponent')
 
 const UrlBarSuggestionItem = require('./urlBarSuggestionItem')
-const windowActions = require('../../../js/actions/windowActions')
-const suggestionTypes = require('../../../js/constants/suggestionTypes')
-const cx = require('../../../js/lib/classSet')
-const locale = require('../../../js/l10n')
-const {isForSecondaryAction} = require('../../../js/lib/eventUtil')
+const windowActions = require('../../../../js/actions/windowActions')
+const suggestionTypes = require('../../../../js/constants/suggestionTypes')
+const cx = require('../../../../js/lib/classSet')
+const locale = require('../../../../js/l10n')
+const {isForSecondaryAction} = require('../../../../js/lib/eventUtil')
 
 class UrlBarSuggestions extends ImmutableComponent {
   constructor () {

js/components/main.js

@@ -18,7 +18,7 @@ const contextMenus = require('../contextMenus')
 const getSetting = require('../settings').getSetting
 
 // Components
-const NavigationBar = require('./navigationBar')
+const NavigationBar = require('./../../app/renderer/components/navigation/navigationBar')
 const Frame = require('./frame')
 const TabPages = require('./tabPages')
 const TabsToolbar = require('./tabsToolbar')

test/unit/app/browser/exportBookmarksTest.js

@@ -113,8 +113,8 @@ describe('Bookmarks export', function () {
     let result = exporter.createBookmarkHTML(personal, other)
     let expected = fs.readFileSync('./test/fixtures/bookmarkExport.html', 'utf8')
 
-    result = result.replace(/\s+/g,' ')
-    expected = expected.replace(/\s+/g,' ')
+    result = result.replace(/\s+/g, ' ')
+    expected = expected.replace(/\s+/g, ' ')
 
     assert.equal(result, expected)
   })

test/unit/js/components/navigationBarTest.js → test/unit/app/renderer/components/navigation/navigationBarTest.js

@@ -9,7 +9,7 @@ const {shallow} = require('enzyme')
 const assert = require('assert')
 const Immutable = require('immutable')
 let NavigationBar, UrlBar
-require('../../braveUnit')
+require('../../../../braveUnit')
 
 describe('NavigationBar component unit tests', function () {
   before(function () {
@@ -22,9 +22,9 @@ describe('NavigationBar component unit tests', function () {
     mockery.registerMock('../../extensions/brave/img/urlbar/browser_URL_fund_yes_verified.svg', {})
     mockery.registerMock('../../extensions/brave/img/urlbar/browser_URL_fund_no.svg', {})
     mockery.registerMock('../../extensions/brave/img/urlbar/browser_URL_fund_yes.svg', {})
-    mockery.registerMock('electron', require('../../lib/fakeElectron'))
-    NavigationBar = require('../../../../js/components/navigationBar')
-    UrlBar = require('../../../../app/renderer/components/urlBar')
+    mockery.registerMock('electron', require('../../../../lib/fakeElectron'))
+    NavigationBar = require('../../../../../../app/renderer/components/navigation/navigationBar')
+    UrlBar = require('../../../../../../app/renderer/components/navigation/urlBar')
   })
 
   after(function () {

test/unit/app/renderer/components/urlBarIconTest.js → test/unit/app/renderer/components/navigation/urlBarIconTest.js

@@ -9,7 +9,7 @@ const {mount} = require('enzyme')
 const sinon = require('sinon')
 const assert = require('assert')
 let UrlBarIcon, windowActions
-require('../../../braveUnit')
+require('../../../../braveUnit')
 
 describe('UrlBarIcon component unit tests', function () {
   before(function () {
@@ -18,9 +18,9 @@ describe('UrlBarIcon component unit tests', function () {
       warnOnUnregistered: false,
       useCleanCache: true
     })
-    mockery.registerMock('electron', require('../../../lib/fakeElectron'))
-    UrlBarIcon = require('../../../../../app/renderer/components/urlBarIcon')
-    windowActions = require('../../../../../js/actions/windowActions')
+    mockery.registerMock('electron', require('../../../../lib/fakeElectron'))
+    UrlBarIcon = require('../../../../../../app/renderer/components/navigation/urlBarIcon')
+    windowActions = require('../../../../../../js/actions/windowActions')
   })
 
   after(function () {

test/unit/app/renderer/components/urlBarSuggestionItemTest.js → test/unit/app/renderer/components/navigation/urlBarSuggestionItemTest.js

@@ -7,10 +7,10 @@ const mockery = require('mockery')
 const {mount} = require('enzyme')
 const assert = require('assert')
 const sinon = require('sinon')
-const fakeElectron = require('../../../lib/fakeElectron')
-const suggestionTypes = require('../../../../../js/constants/suggestionTypes')
+const fakeElectron = require('../../../../lib/fakeElectron')
+const suggestionTypes = require('../../../../../../js/constants/suggestionTypes')
 let UrlBarSuggestionItem
-require('../../../braveUnit')
+require('../../../../braveUnit')
 
 describe('UrlBarSuggestionItem component', function () {
   before(function () {
@@ -20,7 +20,7 @@ describe('UrlBarSuggestionItem component', function () {
       useCleanCache: true
     })
     mockery.registerMock('electron', fakeElectron)
-    UrlBarSuggestionItem = require('../../../../../app/renderer/components/urlBarSuggestionItem')
+    UrlBarSuggestionItem = require('../../../../../../app/renderer/components/navigation/urlBarSuggestionItem')
   })
   after(function () {
     mockery.disable()

test/unit/app/renderer/components/urlBarTest.js → test/unit/app/renderer/components/navigation/urlBarTest.js

@@ -9,7 +9,7 @@ const {shallow} = require('enzyme')
 const assert = require('assert')
 const Immutable = require('immutable')
 let UrlBar, UrlBarIcon
-require('../../../braveUnit')
+require('../../../../braveUnit')
 
 describe('UrlBar component unit tests', function () {
   before(function () {
@@ -22,9 +22,9 @@ describe('UrlBar component unit tests', function () {
     mockery.registerMock('../../extensions/brave/img/urlbar/browser_URL_fund_yes_verified.svg', {})
     mockery.registerMock('../../extensions/brave/img/urlbar/browser_URL_fund_no.svg', {})
     mockery.registerMock('../../extensions/brave/img/urlbar/browser_URL_fund_yes.svg', {})
-    mockery.registerMock('electron', require('../../../lib/fakeElectron'))
-    UrlBar = require('../../../../../app/renderer/components/urlBar')
-    UrlBarIcon = require('../../../../../app/renderer/components/urlBarIcon')
+    mockery.registerMock('electron', require('../../../../lib/fakeElectron'))
+    UrlBar = require('../../../../../../app/renderer/components/navigation/urlBar')
+    UrlBarIcon = require('../../../../../../app/renderer/components/navigation/urlBarIcon')
   })
 
   after(function () {

test/unit/js/components/mainTest.js

@@ -25,7 +25,7 @@ describe('Main component unit tests', function () {
     mockery.registerMock('../../extensions/brave/img/tabs/new_session.svg')
     mockery.registerMock('electron', require('../../lib/fakeElectron'))
     Main = require('../../../../js/components/main')
-    NavigationBar = require('../../../../js/components/navigationBar')
+    NavigationBar = require('../../../../app/renderer/components/navigation/navigationBar')
   })
 
   after(function () {