Bug 964476 - Dont use seperate field to store favicon data. r=kgrandon

apps/system/js/app_window.js

@@ -613,7 +613,7 @@
 
   AppWindow.prototype._handle_mozbrowsericonchange =
     function aw__handle_mozbrowsericonchange(evt) {
-      this.config.icon = evt.detail;
+      this.config.favicon = evt.detail;
       this.publish('iconchange');
     };
 

apps/system/js/places.js

@@ -1,3 +1,6 @@
+/* globals SettingsListener, Promise */
+/* exported Places */
+
 /**
  * Places.
  *
@@ -49,7 +52,8 @@ var Places = {
       this.addVisit(evt.detail.config.url);
       break;
     case 'appiconchange':
-      this.setPlaceIconUri(evt.detail.config.url, evt.detail.config.icon.href);
+      this.setPlaceIconUri(evt.detail.config.url,
+                           evt.detail.config.favicon.href);
       break;
     }
   },

build/jshint/xfail.list

@@ -1049,7 +1049,6 @@ apps/system/js/operator_variant/operator_variant_iccs.js
 apps/system/js/orientation_manager.js
 apps/system/js/payment.js
 apps/system/js/permission_manager.js
-apps/system/js/places.js
 apps/system/js/popup_manager.js
 apps/system/js/quick_settings.js
 apps/system/js/remote_debugger.js