From 3378f7ae8aa64c801fc84dd61bdf76041643bf92 Mon Sep 17 00:00:00 2001
From: saneyuki_s <saneyuki.s.snyk@gmail.com>
Date: Mon, 13 Aug 2012 14:53:36 +0900
Subject: [PATCH 1/2] Use Service.jsm in content/treestyletab/config.js.

---
 content/treestyletab/config.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/content/treestyletab/config.js b/content/treestyletab/config.js
index e71d7fde..a8d6e511 100644
--- a/content/treestyletab/config.js
+++ b/content/treestyletab/config.js
@@ -1,10 +1,8 @@
-const XULAppInfo = Components.classes['@mozilla.org/xre/app-info;1']
-		.getService(Components.interfaces.nsIXULAppInfo);
-const comparator = Components.classes['@mozilla.org/xpcom/version-comparator;1']
-					.getService(Components.interfaces.nsIVersionComparator);
-var Prefs = Components
-		.classes['@mozilla.org/preferences;1']
-		.getService(Components.interfaces.nsIPrefBranch);
+Components.utils.import('resource://gre/modules/Services.jsm');
+
+const XULAppInfo = Services.appinfo;
+const comparator = Services.vc;
+var Prefs = Services.prefs;
 
 Components.utils.import('resource://treestyletab-modules/lib/animationManager.js', {});
 Components.utils.import('resource://treestyletab-modules/lib/prefs.js', {});

From 54a5d46758190c53b2d43607c448773b1c2b97d8 Mon Sep 17 00:00:00 2001
From: saneyuki_s <saneyuki.s.snyk@gmail.com>
Date: Mon, 13 Aug 2012 14:58:40 +0900
Subject: [PATCH 2/2] Use Service.jsm in modules/ (exclude modules/lib/).

---
 modules/tabbarDNDObserver.js |  5 +++--
 modules/utils.js             | 15 ++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/modules/tabbarDNDObserver.js b/modules/tabbarDNDObserver.js
index 899f09ab..80e585eb 100644
--- a/modules/tabbarDNDObserver.js
+++ b/modules/tabbarDNDObserver.js
@@ -40,14 +40,15 @@ const DEBUG = false;
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 
+Components.utils.import('resource://gre/modules/Services.jsm');
+
 const TAB_DROP_TYPE = 'application/x-moz-tabbrowser-tab';
 
 const SSS = Cc['@mozilla.org/content/style-sheet-service;1']
 				.getService(Ci.nsIStyleSheetService);
 const SecMan = Cc['@mozilla.org/scriptsecuritymanager;1']
 				.getService(Ci.nsIScriptSecurityManager);
-const IOService = Cc['@mozilla.org/network/io-service;1']
-				.getService(Ci.nsIIOService);
+const IOService = Services.io;
  
 function TabbarDNDObserver(aTabBrowser) 
 {
diff --git a/modules/utils.js b/modules/utils.js
index 92ad6fd9..6eee61eb 100644
--- a/modules/utils.js
+++ b/modules/utils.js
@@ -38,7 +38,8 @@ const EXPORTED_SYMBOLS = ['TreeStyleTabUtils'];
 const Cc = Components.classes;
 const Ci = Components.interfaces;
  
-Components.utils.import('resource://gre/modules/XPCOMUtils.jsm'); 
+Components.utils.import('resource://gre/modules/XPCOMUtils.jsm');
+Components.utils.import('resource://gre/modules/Services.jsm');
 
 Components.utils.import('resource://treestyletab-modules/lib/prefs.js');
 Components.utils.import('resource://treestyletab-modules/lib/namespace.jsm');
@@ -276,7 +277,7 @@ var TreeStyleTabUtils = {
 
 	get ObserverService() {
 		if (!this._ObserverService) {
-			this._ObserverService = Cc['@mozilla.org/observer-service;1'].getService(Ci.nsIObserverService);
+			this._ObserverService = Services.obs;
 		}
 		return this._ObserverService;
 	},
@@ -284,7 +285,7 @@ var TreeStyleTabUtils = {
 
 	get IOService() {
 		if (!this._IOService) {
-			this._IOService = Cc['@mozilla.org/network/io-service;1'].getService(Ci.nsIIOService);
+			this._IOService = Services.io;
 		}
 		return this._IOService;
 	},
@@ -292,7 +293,7 @@ var TreeStyleTabUtils = {
 
 	get WindowMediator() {
 		if (!this._WindowMediator) {
-			this._WindowMediator = Cc['@mozilla.org/appshell/window-mediator;1'].getService(Ci.nsIWindowMediator);
+			this._WindowMediator = Services.wm;
 		}
 		return this._WindowMediator;
 	},
@@ -301,7 +302,7 @@ var TreeStyleTabUtils = {
 	get PromptService()
 	{
 		if (!this._PromptService) {
-			this._PromptService = Cc['@mozilla.org/embedcomp/prompt-service;1'].getService(Ci.nsIPromptService);
+			this._PromptService = Services.prompt;
 		}
 		return this._PromptService;
 	},
@@ -318,14 +319,14 @@ var TreeStyleTabUtils = {
 
 	get XULAppInfo() {
 		if (!this._XULAppInfo) {
-			this._XULAppInfo = Cc['@mozilla.org/xre/app-info;1'].getService(Ci.nsIXULAppInfo).QueryInterface(Ci.nsIXULRuntime);
+			this._XULAppInfo = Services.appinfo;
 		}
 		return this._XULAppInfo;
 	},
 	_XULAppInfo : null,
 	get Comparator() {
 		if (!this._Comparator) {
-			this._Comparator = Cc['@mozilla.org/xpcom/version-comparator;1'].getService(Ci.nsIVersionComparator);
+			this._Comparator = Services.vc;
 		}
 		return this._Comparator;
 	},