Merge pull request #7295 from brave/fix/7294

sync favicon
brave · Feb 18, 2017 · e259d61 · e259d61
2 parents c7f3cbd + d8ae422
commit e259d61
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/js/state/syncUtil.js b/js/state/syncUtil.js
@@ -357,6 +357,7 @@ module.exports.createSiteData = (site) => {
     location: '',
     title: '',
     customTitle: '',
+    favicon: '',
     lastAccessedTime: 0,
     creationTime: 0
   }

diff --git a/package.json b/package.json
@@ -29,6 +29,7 @@
     "preload-httpse": "node ./preload-httpse.js",
     "start-log": "node ./tools/start.js --user-data-dir=brave-development --debug=5858 --enable-logging=stderr --v=1 --enable-extension-activity-logging --enable-sandbox-logging --enable-dcheck",
     "start": "node ./tools/start.js --user-data-dir=brave-development --debug=5858 --enable-logging --v=0 --enable-extension-activity-logging --enable-sandbox-logging --enable-dcheck",
+    "start2": "node ./tools/start.js --user-data-dir=brave-development-2 --debug=5859 --enable-logging --v=0 --enable-extension-activity-logging --enable-sandbox-logging --enable-dcheck",
     "start-brk": "node ./tools/start.js --debug-brk=5858 -enable-logging --v=0 --enable-dcheck",
     "test": "cross-env NODE_ENV=test mocha --require babel-register --require babel-polyfill --recursive \"test/**/*Test.js\"",
     "unittest": "cross-env NODE_ENV=test mocha --require babel-register --require babel-polyfill --recursive \"test/unit/**/*Test.js\"",

diff --git a/test/unit/state/syncUtilTest.js b/test/unit/state/syncUtilTest.js
@@ -20,6 +20,7 @@ describe('syncUtil', () => {
       name: 'historySite',
       objectId,
       value: {
+        favicon: 'https://calendar.google.com/googlecalendar/images/favicon_v2014_18.ico',
         location: 'https://calendar.google.com/calendar/render#main_7',
         title: 'Google Calendar',
         customTitle: '',