Bug 1227361 - Remove checks for MOZ_SERVICES_SYNC from browser/. r=markh

browser/base/content/browser.js

@@ -165,10 +165,8 @@ XPCOMUtils.defineLazyGetter(this, "gCustomizeMode", function() {
   return new scope.CustomizeMode(window);
 });
 
-#ifdef MOZ_SERVICES_SYNC
 XPCOMUtils.defineLazyModuleGetter(this, "Weave",
   "resource://services-sync/main.js");
-#endif
 
 XPCOMUtils.defineLazyGetter(this, "PopupNotifications", function () {
   let tmp = {};
@@ -282,6 +280,7 @@ var gInitialPages = [
 #include browser-safebrowsing.js
 #include browser-sidebar.js
 #include browser-social.js
+#include browser-syncui.js
 #include browser-tabview.js
 #include browser-thumbnails.js
 #include browser-trackingprotection.js
@@ -290,10 +289,6 @@ var gInitialPages = [
 #include browser-data-submission-info-bar.js
 #endif
 
-#ifdef MOZ_SERVICES_SYNC
-#include browser-syncui.js
-#endif
-
 #include browser-fxaccounts.js
 
 XPCOMUtils.defineLazyGetter(this, "Win7Features", function () {
@@ -1354,11 +1349,9 @@ var gBrowserInit = {
 
     FullScreen.init();
 
-#ifdef MOZ_SERVICES_SYNC
     // initialize the sync UI
     gSyncUI.init();
     gFxAccounts.init();
-#endif
 
 #ifdef MOZ_DATA_REPORTING
     gDataNotificationInfoBar.init();
@@ -1500,9 +1493,7 @@ var gBrowserInit = {
 
     FullScreen.uninit();
 
-#ifdef MOZ_SERVICES_SYNC
     gFxAccounts.uninit();
-#endif
 
     Services.obs.removeObserver(gPluginHandler.NPAPIPluginCrashed, "plugin-crashed");
 
@@ -1659,10 +1650,8 @@ var gBrowserInit = {
     // initialize the private browsing UI
     gPrivateBrowsingUI.init();
 
-#ifdef MOZ_SERVICES_SYNC
     // initialize the sync UI
     gSyncUI.init();
-#endif
 
 #ifdef E10S_TESTING_ONLY
     gRemoteTabsUI.init();
@@ -6842,11 +6831,9 @@ function isTabEmpty(aTab) {
   return true;
 }
 
-#ifdef MOZ_SERVICES_SYNC
 function BrowserOpenSyncTabs() {
   switchToTabHavingURI("about:sync-tabs", true);
 }
-#endif
 
 /**
  * Format a URL