--- a/content/html/content/src/moz.build
+++ b/content/html/content/src/moz.build
@@ -173,17 +173,17 @@ FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/document/src',
     '/content/media/',
     '/content/xul/content/src',
     '/dom/base',
     '/dom/canvas',
     '/dom/xbl',
-    '/editor/libeditor/base',
+    '/editor/libeditor',
     '/editor/libeditor/text',
     '/editor/txmgr',
     '/layout/forms',
     '/layout/generic',
     '/layout/style',
     '/layout/tables',
     '/layout/xul',
     '/netwerk/base/src',

--- a/editor/crashtests.list
+++ b/editor/crashtests.list
@@ -1,9 +1,9 @@
 # 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/.
 
 include libeditor/html/crashtests/crashtests.list
-include libeditor/base/crashtests/crashtests.list
+include libeditor/crashtests/crashtests.list
 include libeditor/text/crashtests/crashtests.list
 include composer/crashtests/crashtests.list
 include txmgr/tests/crashtests/crashtests.list

rename from editor/libeditor/base/ChangeAttributeTxn.cpp
rename to editor/libeditor/ChangeAttributeTxn.cpp

rename from editor/libeditor/base/ChangeAttributeTxn.h
rename to editor/libeditor/ChangeAttributeTxn.h

rename from editor/libeditor/base/ChangeCSSInlineStyleTxn.cpp
rename to editor/libeditor/ChangeCSSInlineStyleTxn.cpp

rename from editor/libeditor/base/ChangeCSSInlineStyleTxn.h
rename to editor/libeditor/ChangeCSSInlineStyleTxn.h

rename from editor/libeditor/base/CreateElementTxn.cpp
rename to editor/libeditor/CreateElementTxn.cpp

rename from editor/libeditor/base/CreateElementTxn.h
rename to editor/libeditor/CreateElementTxn.h

rename from editor/libeditor/base/DeleteNodeTxn.cpp
rename to editor/libeditor/DeleteNodeTxn.cpp

rename from editor/libeditor/base/DeleteNodeTxn.h
rename to editor/libeditor/DeleteNodeTxn.h

rename from editor/libeditor/base/DeleteRangeTxn.cpp
rename to editor/libeditor/DeleteRangeTxn.cpp

rename from editor/libeditor/base/DeleteRangeTxn.h
rename to editor/libeditor/DeleteRangeTxn.h

rename from editor/libeditor/base/DeleteTextTxn.cpp
rename to editor/libeditor/DeleteTextTxn.cpp

rename from editor/libeditor/base/DeleteTextTxn.h
rename to editor/libeditor/DeleteTextTxn.h

rename from editor/libeditor/base/EditActionListener.h
rename to editor/libeditor/EditActionListener.h

rename from editor/libeditor/base/EditAggregateTxn.cpp
rename to editor/libeditor/EditAggregateTxn.cpp

rename from editor/libeditor/base/EditAggregateTxn.h
rename to editor/libeditor/EditAggregateTxn.h

rename from editor/libeditor/base/EditTxn.cpp
rename to editor/libeditor/EditTxn.cpp

rename from editor/libeditor/base/EditTxn.h
rename to editor/libeditor/EditTxn.h

rename from editor/libeditor/base/IMETextTxn.cpp
rename to editor/libeditor/IMETextTxn.cpp

rename from editor/libeditor/base/IMETextTxn.h
rename to editor/libeditor/IMETextTxn.h

rename from editor/libeditor/base/InsertElementTxn.cpp
rename to editor/libeditor/InsertElementTxn.cpp

rename from editor/libeditor/base/InsertElementTxn.h
rename to editor/libeditor/InsertElementTxn.h

rename from editor/libeditor/base/InsertTextTxn.cpp
rename to editor/libeditor/InsertTextTxn.cpp

rename from editor/libeditor/base/InsertTextTxn.h
rename to editor/libeditor/InsertTextTxn.h

rename from editor/libeditor/base/JoinElementTxn.cpp
rename to editor/libeditor/JoinElementTxn.cpp

rename from editor/libeditor/base/JoinElementTxn.h
rename to editor/libeditor/JoinElementTxn.h

rename from editor/libeditor/base/PlaceholderTxn.cpp
rename to editor/libeditor/PlaceholderTxn.cpp

rename from editor/libeditor/base/PlaceholderTxn.h
rename to editor/libeditor/PlaceholderTxn.h

rename from editor/libeditor/base/SetDocTitleTxn.cpp
rename to editor/libeditor/SetDocTitleTxn.cpp

rename from editor/libeditor/base/SetDocTitleTxn.h
rename to editor/libeditor/SetDocTitleTxn.h

rename from editor/libeditor/base/SplitElementTxn.cpp
rename to editor/libeditor/SplitElementTxn.cpp

rename from editor/libeditor/base/SplitElementTxn.h
rename to editor/libeditor/SplitElementTxn.h

deleted file mode 100644
--- a/editor/libeditor/base/moz.build
+++ /dev/null
@@ -1,44 +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/.
-
-TEST_DIRS += ['tests']
-
-UNIFIED_SOURCES += [
-    'ChangeAttributeTxn.cpp',
-    'ChangeCSSInlineStyleTxn.cpp',
-    'CreateElementTxn.cpp',
-    'DeleteNodeTxn.cpp',
-    'DeleteRangeTxn.cpp',
-    'DeleteTextTxn.cpp',
-    'EditAggregateTxn.cpp',
-    'EditTxn.cpp',
-    'IMETextTxn.cpp',
-    'InsertElementTxn.cpp',
-    'InsertTextTxn.cpp',
-    'JoinElementTxn.cpp',
-    'nsEditor.cpp',
-    'nsEditorCommands.cpp',
-    'nsEditorController.cpp',
-    'nsEditorEventListener.cpp',
-    'nsEditorUtils.cpp',
-    'nsSelectionState.cpp',
-    'nsStyleSheetTxns.cpp',
-    'PlaceholderTxn.cpp',
-    'SetDocTitleTxn.cpp',
-    'SplitElementTxn.cpp',
-]
-
-FAIL_ON_WARNINGS = True
-
-LOCAL_INCLUDES += [
-    '../text',
-    '/content/base/src',
-    '/editor/txmgr',
-    '/extensions/spellcheck/src',
-    '/layout/style',
-]
-
-FINAL_LIBRARY = 'xul'

rename from editor/libeditor/base/crashtests/336104.html
rename to editor/libeditor/crashtests/336104.html

rename from editor/libeditor/base/crashtests/382527-1.html
rename to editor/libeditor/crashtests/382527-1.html

rename from editor/libeditor/base/crashtests/402172-1.html
rename to editor/libeditor/crashtests/402172-1.html

rename from editor/libeditor/base/crashtests/407079-1.html
rename to editor/libeditor/crashtests/407079-1.html

rename from editor/libeditor/base/crashtests/407256-1.html
rename to editor/libeditor/crashtests/407256-1.html

rename from editor/libeditor/base/crashtests/430624-1.html
rename to editor/libeditor/crashtests/430624-1.html

rename from editor/libeditor/base/crashtests/459613-iframe.html
rename to editor/libeditor/crashtests/459613-iframe.html

rename from editor/libeditor/base/crashtests/459613.html
rename to editor/libeditor/crashtests/459613.html

rename from editor/libeditor/base/crashtests/475132-1.xhtml
rename to editor/libeditor/crashtests/475132-1.xhtml

rename from editor/libeditor/base/crashtests/633709.xhtml
rename to editor/libeditor/crashtests/633709.xhtml

rename from editor/libeditor/base/crashtests/636074-1.html
rename to editor/libeditor/crashtests/636074-1.html

rename from editor/libeditor/base/crashtests/713427-1.html
rename to editor/libeditor/crashtests/713427-1.html

rename from editor/libeditor/base/crashtests/713427-2.xhtml
rename to editor/libeditor/crashtests/713427-2.xhtml

rename from editor/libeditor/base/crashtests/762183.html
rename to editor/libeditor/crashtests/762183.html

rename from editor/libeditor/base/crashtests/766360.html
rename to editor/libeditor/crashtests/766360.html

rename from editor/libeditor/base/crashtests/766413.html
rename to editor/libeditor/crashtests/766413.html

rename from editor/libeditor/base/crashtests/766845.xhtml
rename to editor/libeditor/crashtests/766845.xhtml

rename from editor/libeditor/base/crashtests/768765.html
rename to editor/libeditor/crashtests/768765.html

rename from editor/libeditor/base/crashtests/771749.html
rename to editor/libeditor/crashtests/771749.html

rename from editor/libeditor/base/crashtests/772282.html
rename to editor/libeditor/crashtests/772282.html

rename from editor/libeditor/base/crashtests/776323.html
rename to editor/libeditor/crashtests/776323.html

rename from editor/libeditor/base/crashtests/crashtests.list
rename to editor/libeditor/crashtests/crashtests.list

--- a/editor/libeditor/html/moz.build
+++ b/editor/libeditor/html/moz.build
@@ -24,17 +24,17 @@ UNIFIED_SOURCES += [
     'nsWSRunObject.cpp',
     'TextEditorTest.cpp',
     'TypeInState.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
-    '../base',
+    '..',
     '../text',
     '/content/base/src',
     '/editor/txmgr',
     '/layout/generic',
     '/layout/style',
     '/layout/tables',
     '/layout/xul',
 ]

--- a/editor/libeditor/moz.build
+++ b/editor/libeditor/moz.build
@@ -1,7 +1,46 @@
 # -*- 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 += ['base', 'text', 'html']
+DIRS += ['text', 'html']
+
+TEST_DIRS += ['tests']
+
+UNIFIED_SOURCES += [
+    'ChangeAttributeTxn.cpp',
+    'ChangeCSSInlineStyleTxn.cpp',
+    'CreateElementTxn.cpp',
+    'DeleteNodeTxn.cpp',
+    'DeleteRangeTxn.cpp',
+    'DeleteTextTxn.cpp',
+    'EditAggregateTxn.cpp',
+    'EditTxn.cpp',
+    'IMETextTxn.cpp',
+    'InsertElementTxn.cpp',
+    'InsertTextTxn.cpp',
+    'JoinElementTxn.cpp',
+    'nsEditor.cpp',
+    'nsEditorCommands.cpp',
+    'nsEditorController.cpp',
+    'nsEditorEventListener.cpp',
+    'nsEditorUtils.cpp',
+    'nsSelectionState.cpp',
+    'nsStyleSheetTxns.cpp',
+    'PlaceholderTxn.cpp',
+    'SetDocTitleTxn.cpp',
+    'SplitElementTxn.cpp',
+]
+
+FAIL_ON_WARNINGS = True
+
+LOCAL_INCLUDES += [
+    '/content/base/src',
+    '/editor/txmgr',
+    '/extensions/spellcheck/src',
+    '/layout/style',
+    'text',
+]
+
+FINAL_LIBRARY = 'xul'

rename from editor/libeditor/base/nsEditProperty.h
rename to editor/libeditor/nsEditProperty.h

rename from editor/libeditor/base/nsEditPropertyAtomList.h
rename to editor/libeditor/nsEditPropertyAtomList.h

rename from editor/libeditor/base/nsEditRules.h
rename to editor/libeditor/nsEditRules.h

rename from editor/libeditor/base/nsEditor.cpp
rename to editor/libeditor/nsEditor.cpp

rename from editor/libeditor/base/nsEditor.h
rename to editor/libeditor/nsEditor.h

rename from editor/libeditor/base/nsEditorCommands.cpp
rename to editor/libeditor/nsEditorCommands.cpp

rename from editor/libeditor/base/nsEditorCommands.h
rename to editor/libeditor/nsEditorCommands.h

rename from editor/libeditor/base/nsEditorController.cpp
rename to editor/libeditor/nsEditorController.cpp

rename from editor/libeditor/base/nsEditorController.h
rename to editor/libeditor/nsEditorController.h

rename from editor/libeditor/base/nsEditorEventListener.cpp
rename to editor/libeditor/nsEditorEventListener.cpp

rename from editor/libeditor/base/nsEditorEventListener.h
rename to editor/libeditor/nsEditorEventListener.h

rename from editor/libeditor/base/nsEditorUtils.cpp
rename to editor/libeditor/nsEditorUtils.cpp

rename from editor/libeditor/base/nsEditorUtils.h
rename to editor/libeditor/nsEditorUtils.h

rename from editor/libeditor/base/nsIAbsorbingTransaction.h
rename to editor/libeditor/nsIAbsorbingTransaction.h

rename from editor/libeditor/base/nsSelectionState.cpp
rename to editor/libeditor/nsSelectionState.cpp

rename from editor/libeditor/base/nsSelectionState.h
rename to editor/libeditor/nsSelectionState.h

rename from editor/libeditor/base/nsStyleSheetTxns.cpp
rename to editor/libeditor/nsStyleSheetTxns.cpp

rename from editor/libeditor/base/nsStyleSheetTxns.h
rename to editor/libeditor/nsStyleSheetTxns.h

rename from editor/libeditor/base/tests/chrome.ini
rename to editor/libeditor/tests/chrome.ini

rename from editor/libeditor/base/tests/file_bug586662.html
rename to editor/libeditor/tests/file_bug586662.html

rename from editor/libeditor/base/tests/mochitest.ini
rename to editor/libeditor/tests/mochitest.ini

rename from editor/libeditor/base/tests/moz.build
rename to editor/libeditor/tests/moz.build

rename from editor/libeditor/base/tests/test_bug408231.html
rename to editor/libeditor/tests/test_bug408231.html

rename from editor/libeditor/base/tests/test_bug46555.html
rename to editor/libeditor/tests/test_bug46555.html

rename from editor/libeditor/base/tests/test_bug502673.html
rename to editor/libeditor/tests/test_bug502673.html

rename from editor/libeditor/base/tests/test_bug514156.html
rename to editor/libeditor/tests/test_bug514156.html

rename from editor/libeditor/base/tests/test_bug567213.html
rename to editor/libeditor/tests/test_bug567213.html

rename from editor/libeditor/base/tests/test_bug586662.html
rename to editor/libeditor/tests/test_bug586662.html

rename from editor/libeditor/base/tests/test_bug599983.html
rename to editor/libeditor/tests/test_bug599983.html

rename from editor/libeditor/base/tests/test_bug599983.xul
rename to editor/libeditor/tests/test_bug599983.xul

rename from editor/libeditor/base/tests/test_bug646194.xul
rename to editor/libeditor/tests/test_bug646194.xul

rename from editor/libeditor/base/tests/test_bug742261.html
rename to editor/libeditor/tests/test_bug742261.html

rename from editor/libeditor/base/tests/test_bug773262.html
rename to editor/libeditor/tests/test_bug773262.html

rename from editor/libeditor/base/tests/test_bug795785.html
rename to editor/libeditor/tests/test_bug795785.html

rename from editor/libeditor/base/tests/test_composition_event_created_in_chrome.html
rename to editor/libeditor/tests/test_composition_event_created_in_chrome.html

rename from editor/libeditor/base/tests/test_dragdrop.html
rename to editor/libeditor/tests/test_dragdrop.html

rename from editor/libeditor/base/tests/test_selection_move_commands.xul
rename to editor/libeditor/tests/test_selection_move_commands.xul

--- a/editor/libeditor/text/moz.build
+++ b/editor/libeditor/text/moz.build
@@ -11,17 +11,17 @@ UNIFIED_SOURCES += [
     'nsTextEditRules.cpp',
     'nsTextEditRulesBidi.cpp',
     'nsTextEditUtils.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
-    '../base',
+    '..',
     '/content/base/src',
     '/editor/txmgr',
 ]
 
 FINAL_LIBRARY = 'xul'
 
 MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
 

--- a/extensions/spellcheck/hunspell/src/moz.build
+++ b/extensions/spellcheck/hunspell/src/moz.build
@@ -30,17 +30,17 @@ if not CONFIG['MOZ_NATIVE_HUNSPELL']:
     DEFINES['HUNSPELL_STATIC'] = True
 else:
     CXXFLAGS += CONFIG['MOZ_HUNSPELL_CFLAGS']
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '/content/base/src',
-    '/editor/libeditor/base',
+    '/editor/libeditor',
     '/extensions/spellcheck/src',
 ]
 
 # Suppress warnings in third-party code.
 if CONFIG['CLANG_CXX']:
     CXXFLAGS += ['-Wno-unused-private-field']
 
 include('/ipc/chromium/chromium-config.mozbuild')

--- a/extensions/spellcheck/src/moz.build
+++ b/extensions/spellcheck/src/moz.build
@@ -16,15 +16,15 @@ SOURCES += [
     'mozSpellI18NManager.cpp',
 ]
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../hunspell/src',
     '/content/base/src',
-    '/editor/libeditor/base',
+    '/editor/libeditor',
 ]
 EXPORTS.mozilla += [
      'mozSpellChecker.h',
 ]
 
 FAIL_ON_WARNINGS = True

--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -60,17 +60,17 @@ LOCAL_INCLUDES += [
     '/dom/src/storage',
     '/dom/telephony',
     '/dom/xbl',
     '/dom/xslt/base',
     '/dom/xslt/xml',
     '/dom/xslt/xpath',
     '/dom/xslt/xslt',
     '/editor/composer',
-    '/editor/libeditor/base',
+    '/editor/libeditor',
     '/editor/libeditor/html',
     '/editor/libeditor/text',
     '/editor/txmgr',
     '/editor/txtsvc',
     '/extensions/cookie',
     '/js/xpconnect/loader',
     '/js/xpconnect/src',
     '/netwerk/base/src',

--- a/layout/forms/moz.build
+++ b/layout/forms/moz.build
@@ -40,17 +40,17 @@ FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../../content/base/src',
     '../../content/html/content/src',
-    '../../editor/libeditor/base',
+    '../../editor/libeditor',
     '../../editor/libeditor/text',
     '../../editor/txmgr',
     '../base',
     '../generic',
     '../xul',
 ]
 
 if CONFIG['ENABLE_INTL_API']:

--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -1935,17 +1935,17 @@ WITH THE USE OR PERFORMANCE OF THIS SOFT
 
 
     <hr>
 
     <h1><a id="chromium"></a>Chromium License</h1>
 
     <p>This license applies to parts of the code in
       <span class="path">security/sandbox/</span>,
-      <span class="path">editor/libeditor/base/nsEditorEventListener.cpp</span>,
+      <span class="path">editor/libeditor/nsEditorEventListener.cpp</span>,
       <span class="path">widget/cocoa/GfxInfo.mm</span>
       and also some files in the directories
       <span class="path">ipc/chromium/</span>,
       <span class="path">dom/plugins/</span>,
       <span class="path">tools/profiler/sps/</span>,
       <span class="path">gfx/ots/</span>,
       <span class="path">gfx/ycbcr</span> and
       <span class="path">content/media/webspeech/recognition/</span>.