From 8048e8cb70711452c9b7690e483dde5d50fa3cee Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Wed, 20 Aug 2014 10:27:16 -0700
Subject: [PATCH] Bug 1054703 - Part 1: Flatten embedding/base/ into parent
 directory. r=bsmedberg

--HG--
rename : embedding/base/nsEmbedCID.h => embedding/nsEmbedCID.h
rename : embedding/base/nsIWindowCreator.idl => embedding/nsIWindowCreator.idl
rename : embedding/base/nsIWindowCreator2.idl => embedding/nsIWindowCreator2.idl
rename : embedding/base/nsIWindowProvider.idl => embedding/nsIWindowProvider.idl
---
 embedding/base/moz.build                   | 17 -----------------
 embedding/moz.build                        | 14 +++++++++++++-
 embedding/{base => }/nsEmbedCID.h          |  0
 embedding/{base => }/nsIWindowCreator.idl  |  0
 embedding/{base => }/nsIWindowCreator2.idl |  0
 embedding/{base => }/nsIWindowProvider.idl |  0
 6 files changed, 13 insertions(+), 18 deletions(-)
 delete mode 100644 embedding/base/moz.build
 rename embedding/{base => }/nsEmbedCID.h (100%)
 rename embedding/{base => }/nsIWindowCreator.idl (100%)
 rename embedding/{base => }/nsIWindowCreator2.idl (100%)
 rename embedding/{base => }/nsIWindowProvider.idl (100%)

diff --git a/embedding/base/moz.build b/embedding/base/moz.build
deleted file mode 100644
index 80ee3d5c9f0..00000000000
--- a/embedding/base/moz.build
+++ /dev/null
@@ -1,17 +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 += [
-    'nsIWindowCreator.idl',
-    'nsIWindowCreator2.idl',
-    'nsIWindowProvider.idl',
-]
-
-XPIDL_MODULE = 'embed_base'
-
-EXPORTS += [
-    'nsEmbedCID.h',
-]
diff --git a/embedding/moz.build b/embedding/moz.build
index 35f6bde5e01..a3bcedfcfb9 100644
--- a/embedding/moz.build
+++ b/embedding/moz.build
@@ -4,7 +4,7 @@
 # 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/.
 
-DIRS += ['base', 'components', 'browser']
+DIRS += ['components', 'browser']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     DIRS += ['android/geckoview_example']
@@ -13,3 +13,15 @@ TEST_DIRS += ['test']
 
 if CONFIG['ENABLE_TESTS']:
     XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
+
+XPIDL_SOURCES += [
+    'nsIWindowCreator.idl',
+    'nsIWindowCreator2.idl',
+    'nsIWindowProvider.idl',
+]
+
+XPIDL_MODULE = 'embed_base'
+
+EXPORTS += [
+    'nsEmbedCID.h',
+]
diff --git a/embedding/base/nsEmbedCID.h b/embedding/nsEmbedCID.h
similarity index 100%
rename from embedding/base/nsEmbedCID.h
rename to embedding/nsEmbedCID.h
diff --git a/embedding/base/nsIWindowCreator.idl b/embedding/nsIWindowCreator.idl
similarity index 100%
rename from embedding/base/nsIWindowCreator.idl
rename to embedding/nsIWindowCreator.idl
diff --git a/embedding/base/nsIWindowCreator2.idl b/embedding/nsIWindowCreator2.idl
similarity index 100%
rename from embedding/base/nsIWindowCreator2.idl
rename to embedding/nsIWindowCreator2.idl
diff --git a/embedding/base/nsIWindowProvider.idl b/embedding/nsIWindowProvider.idl
similarity index 100%
rename from embedding/base/nsIWindowProvider.idl
rename to embedding/nsIWindowProvider.idl