From 5b1857c6327e68366046b81560b067d6f989b1c9 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Fri, 12 Jun 2015 08:32:30 +0900
Subject: [PATCH] Bug 1173681 - Move nsIProfileUnlocker.idl to toolkit/profile
 and remove profile. r=bsmedberg

---
 b2g/installer/package-manifest.in                   |  1 -
 browser/installer/package-manifest.in               |  1 -
 mobile/android/installer/package-manifest.in        |  1 -
 profile/moz.build                                   | 11 -----------
 toolkit/profile/moz.build                           |  1 +
 {profile => toolkit/profile}/notifications.txt      |  0
 {profile => toolkit/profile}/nsIProfileUnlocker.idl |  0
 toolkit/toolkit.mozbuild                            |  2 --
 8 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 profile/moz.build
 rename {profile => toolkit/profile}/notifications.txt (100%)
 rename {profile => toolkit/profile}/nsIProfileUnlocker.idl (100%)

diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in
index b5a768ffddb..8447fdb36ee 100644
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -305,7 +305,6 @@
 @RESPATH@/components/plugin.xpt
 @RESPATH@/components/pref.xpt
 @RESPATH@/components/prefetch.xpt
-@RESPATH@/components/profile.xpt
 #ifdef MOZ_ENABLE_PROFILER_SPS
 @RESPATH@/components/profiler.xpt
 #endif
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 3a03208dc15..b13939fbaee 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -306,7 +306,6 @@
 @RESPATH@/components/plugin.xpt
 @RESPATH@/components/pref.xpt
 @RESPATH@/components/prefetch.xpt
-@RESPATH@/components/profile.xpt
 #ifdef MOZ_ENABLE_PROFILER_SPS
 @RESPATH@/components/profiler.xpt
 #endif
diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in
index 1eb91dc104c..ae186b4285f 100644
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -231,7 +231,6 @@
 @BINPATH@/components/plugin.xpt
 @BINPATH@/components/pref.xpt
 @BINPATH@/components/prefetch.xpt
-@BINPATH@/components/profile.xpt
 #ifdef MOZ_ENABLE_PROFILER_SPS
 @BINPATH@/components/profiler.xpt
 #endif
diff --git a/profile/moz.build b/profile/moz.build
deleted file mode 100644
index 106342671e8..00000000000
--- a/profile/moz.build
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-XPIDL_SOURCES += [
-    'nsIProfileUnlocker.idl',
-]
-
-XPIDL_MODULE = 'profile'
diff --git a/toolkit/profile/moz.build b/toolkit/profile/moz.build
index 55b1c7cb3ea..521c480f132 100644
--- a/toolkit/profile/moz.build
+++ b/toolkit/profile/moz.build
@@ -8,6 +8,7 @@ MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
 
 XPIDL_SOURCES += [
     'nsIProfileMigrator.idl',
+    'nsIProfileUnlocker.idl',
     'nsIToolkitProfile.idl',
     'nsIToolkitProfileService.idl',
 ]
diff --git a/profile/notifications.txt b/toolkit/profile/notifications.txt
similarity index 100%
rename from profile/notifications.txt
rename to toolkit/profile/notifications.txt
diff --git a/profile/nsIProfileUnlocker.idl b/toolkit/profile/nsIProfileUnlocker.idl
similarity index 100%
rename from profile/nsIProfileUnlocker.idl
rename to toolkit/profile/nsIProfileUnlocker.idl
diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild
index cd18c6dc760..f91d5505187 100644
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -117,8 +117,6 @@ else:
 
 # toolkit
 
-DIRS += ['/profile']
-
 # This must precede xpfe.
 if CONFIG['MOZ_JPROF']:
     DIRS += ['/tools/jprof']