rename from chrome/src/Makefile.in
rename to chrome/Makefile.in

rename from chrome/src/RegistryMessageUtils.h
rename to chrome/RegistryMessageUtils.h

--- a/chrome/moz.build
+++ b/chrome/moz.build
@@ -1,8 +1,41 @@
 # -*- 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/.
 
-DIRS += ['public', 'src']
 TEST_DIRS += ['test']
+
+XPIDL_SOURCES += [
+    'nsIChromeRegistry.idl',
+    'nsIToolkitChromeRegistry.idl',
+]
+
+XPIDL_MODULE = 'chrome'
+
+EXPORTS.mozilla.chrome += [
+    'RegistryMessageUtils.h',
+]
+
+UNIFIED_SOURCES += [
+    'nsChromeProtocolHandler.cpp',
+    'nsChromeRegistry.cpp',
+    'nsChromeRegistryChrome.cpp',
+    'nsChromeRegistryContent.cpp',
+]
+
+MSVC_ENABLE_PGO = True
+
+include('/ipc/chromium/chromium-config.mozbuild')
+
+FINAL_LIBRARY = 'xpcom_core'
+
+GENERATED_INCLUDES += [
+    '/xpcom',
+]
+
+LOCAL_INCLUDES += [
+    '/netwerk/base/src',
+    '/netwerk/protocol/res',
+    '/xpcom/components'
+]

rename from chrome/src/nsChromeProtocolHandler.cpp
rename to chrome/nsChromeProtocolHandler.cpp

rename from chrome/src/nsChromeProtocolHandler.h
rename to chrome/nsChromeProtocolHandler.h

rename from chrome/src/nsChromeRegistry.cpp
rename to chrome/nsChromeRegistry.cpp

rename from chrome/src/nsChromeRegistry.h
rename to chrome/nsChromeRegistry.h

rename from chrome/src/nsChromeRegistryChrome.cpp
rename to chrome/nsChromeRegistryChrome.cpp

rename from chrome/src/nsChromeRegistryChrome.h
rename to chrome/nsChromeRegistryChrome.h

rename from chrome/src/nsChromeRegistryContent.cpp
rename to chrome/nsChromeRegistryContent.cpp

rename from chrome/src/nsChromeRegistryContent.h
rename to chrome/nsChromeRegistryContent.h

rename from chrome/public/nsIChromeRegistry.idl
rename to chrome/nsIChromeRegistry.idl

rename from chrome/public/nsIToolkitChromeRegistry.idl
rename to chrome/nsIToolkitChromeRegistry.idl

deleted file mode 100644
--- a/chrome/public/moz.build
+++ /dev/null
@@ -1,13 +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 += [
-    'nsIChromeRegistry.idl',
-    'nsIToolkitChromeRegistry.idl',
-]
-
-XPIDL_MODULE = 'chrome'
-

deleted file mode 100644
--- a/chrome/src/moz.build
+++ /dev/null
@@ -1,32 +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/.
-
-EXPORTS.mozilla.chrome += [
-    'RegistryMessageUtils.h',
-]
-
-UNIFIED_SOURCES += [
-    'nsChromeProtocolHandler.cpp',
-    'nsChromeRegistry.cpp',
-    'nsChromeRegistryChrome.cpp',
-    'nsChromeRegistryContent.cpp',
-]
-
-MSVC_ENABLE_PGO = True
-
-include('/ipc/chromium/chromium-config.mozbuild')
-
-FINAL_LIBRARY = 'xpcom_core'
-
-GENERATED_INCLUDES += [
-    '/xpcom',
-]
-
-LOCAL_INCLUDES += [
-    '/netwerk/base/src',
-    '/netwerk/protocol/res',
-    '/xpcom/components'
-]

--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -101,17 +101,17 @@ FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../src/base',
     '../src/geolocation',
     '../src/storage',
-    '/chrome/src',
+    '/chrome',
     '/content/base/src',
     '/content/media/webspeech/synth/ipc',
     '/docshell/base',
     '/dom/base',
     '/dom/bluetooth',
     '/dom/bluetooth/ipc',
     '/dom/devicestorage',
     '/dom/filesystem',

--- a/xpcom/build/moz.build
+++ b/xpcom/build/moz.build
@@ -86,16 +86,16 @@ GENERATED_INCLUDES += ['..']
 LOCAL_INCLUDES += [
     '../base',
     '../components',
     '../ds',
     '../glue',
     '../io',
     '../reflect/xptinfo',
     '../threads',
-    '/chrome/src',
+    '/chrome',
     '/docshell/base',
 ]
 
 if CONFIG['MOZ_VPX']:
     LOCAL_INCLUDES += [
         '/media/libvpx',
     ]

--- a/xpcom/components/moz.build
+++ b/xpcom/components/moz.build
@@ -45,11 +45,11 @@ MSVC_ENABLE_PGO = True
 FINAL_LIBRARY = 'xpcom_core'
 
 GENERATED_INCLUDES += ['..']
 LOCAL_INCLUDES += [
     '../base',
     '../build',
     '../ds',
     '../reflect/xptinfo',
-    '/chrome/src',
+    '/chrome',
     '/modules/libjar',
 ]