Bug 1028565 - Part 4: Flatten editor/libeditor/base/ directory. r=ehsan
☠☠ backed out by 71f6b8a9b2e8 ☠ ☠
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Mon, 23 Jun 2014 16:27:43 -0700
changeset 211397 5e9777d3805262d3179babc853832594c63a966b
parent 211396 3510bcdba3fc25f2bd35327fb234e62cffc609fb
child 211398 fdd74c065e5d743bd4d1a3044b2e76727dfb60f0
push id3857
push userraliiev@mozilla.com
push dateTue, 02 Sep 2014 16:39:23 +0000
treeherdermozilla-beta@5638b907b505 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersehsan
bugs1028565
milestone33.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1028565 - Part 4: Flatten editor/libeditor/base/ directory. r=ehsan
content/html/content/src/moz.build
editor/crashtests.list
editor/libeditor/ChangeAttributeTxn.cpp
editor/libeditor/ChangeAttributeTxn.h
editor/libeditor/ChangeCSSInlineStyleTxn.cpp
editor/libeditor/ChangeCSSInlineStyleTxn.h
editor/libeditor/CreateElementTxn.cpp
editor/libeditor/CreateElementTxn.h
editor/libeditor/DeleteNodeTxn.cpp
editor/libeditor/DeleteNodeTxn.h
editor/libeditor/DeleteRangeTxn.cpp
editor/libeditor/DeleteRangeTxn.h
editor/libeditor/DeleteTextTxn.cpp
editor/libeditor/DeleteTextTxn.h
editor/libeditor/EditActionListener.h
editor/libeditor/EditAggregateTxn.cpp
editor/libeditor/EditAggregateTxn.h
editor/libeditor/EditTxn.cpp
editor/libeditor/EditTxn.h
editor/libeditor/IMETextTxn.cpp
editor/libeditor/IMETextTxn.h
editor/libeditor/InsertElementTxn.cpp
editor/libeditor/InsertElementTxn.h
editor/libeditor/InsertTextTxn.cpp
editor/libeditor/InsertTextTxn.h
editor/libeditor/JoinElementTxn.cpp
editor/libeditor/JoinElementTxn.h
editor/libeditor/PlaceholderTxn.cpp
editor/libeditor/PlaceholderTxn.h
editor/libeditor/SetDocTitleTxn.cpp
editor/libeditor/SetDocTitleTxn.h
editor/libeditor/SplitElementTxn.cpp
editor/libeditor/SplitElementTxn.h
editor/libeditor/base/ChangeAttributeTxn.cpp
editor/libeditor/base/ChangeAttributeTxn.h
editor/libeditor/base/ChangeCSSInlineStyleTxn.cpp
editor/libeditor/base/ChangeCSSInlineStyleTxn.h
editor/libeditor/base/CreateElementTxn.cpp
editor/libeditor/base/CreateElementTxn.h
editor/libeditor/base/DeleteNodeTxn.cpp
editor/libeditor/base/DeleteNodeTxn.h
editor/libeditor/base/DeleteRangeTxn.cpp
editor/libeditor/base/DeleteRangeTxn.h
editor/libeditor/base/DeleteTextTxn.cpp
editor/libeditor/base/DeleteTextTxn.h
editor/libeditor/base/EditActionListener.h
editor/libeditor/base/EditAggregateTxn.cpp
editor/libeditor/base/EditAggregateTxn.h
editor/libeditor/base/EditTxn.cpp
editor/libeditor/base/EditTxn.h
editor/libeditor/base/IMETextTxn.cpp
editor/libeditor/base/IMETextTxn.h
editor/libeditor/base/InsertElementTxn.cpp
editor/libeditor/base/InsertElementTxn.h
editor/libeditor/base/InsertTextTxn.cpp
editor/libeditor/base/InsertTextTxn.h
editor/libeditor/base/JoinElementTxn.cpp
editor/libeditor/base/JoinElementTxn.h
editor/libeditor/base/PlaceholderTxn.cpp
editor/libeditor/base/PlaceholderTxn.h
editor/libeditor/base/SetDocTitleTxn.cpp
editor/libeditor/base/SetDocTitleTxn.h
editor/libeditor/base/SplitElementTxn.cpp
editor/libeditor/base/SplitElementTxn.h
editor/libeditor/base/crashtests/336104.html
editor/libeditor/base/crashtests/382527-1.html
editor/libeditor/base/crashtests/402172-1.html
editor/libeditor/base/crashtests/407079-1.html
editor/libeditor/base/crashtests/407256-1.html
editor/libeditor/base/crashtests/430624-1.html
editor/libeditor/base/crashtests/459613-iframe.html
editor/libeditor/base/crashtests/459613.html
editor/libeditor/base/crashtests/475132-1.xhtml
editor/libeditor/base/crashtests/633709.xhtml
editor/libeditor/base/crashtests/636074-1.html
editor/libeditor/base/crashtests/713427-1.html
editor/libeditor/base/crashtests/713427-2.xhtml
editor/libeditor/base/crashtests/762183.html
editor/libeditor/base/crashtests/766360.html
editor/libeditor/base/crashtests/766413.html
editor/libeditor/base/crashtests/766845.xhtml
editor/libeditor/base/crashtests/768765.html
editor/libeditor/base/crashtests/771749.html
editor/libeditor/base/crashtests/772282.html
editor/libeditor/base/crashtests/776323.html
editor/libeditor/base/crashtests/crashtests.list
editor/libeditor/base/moz.build
editor/libeditor/base/nsEditProperty.h
editor/libeditor/base/nsEditPropertyAtomList.h
editor/libeditor/base/nsEditRules.h
editor/libeditor/base/nsEditor.cpp
editor/libeditor/base/nsEditor.h
editor/libeditor/base/nsEditorCommands.cpp
editor/libeditor/base/nsEditorCommands.h
editor/libeditor/base/nsEditorController.cpp
editor/libeditor/base/nsEditorController.h
editor/libeditor/base/nsEditorEventListener.cpp
editor/libeditor/base/nsEditorEventListener.h
editor/libeditor/base/nsEditorUtils.cpp
editor/libeditor/base/nsEditorUtils.h
editor/libeditor/base/nsIAbsorbingTransaction.h
editor/libeditor/base/nsSelectionState.cpp
editor/libeditor/base/nsSelectionState.h
editor/libeditor/base/nsStyleSheetTxns.cpp
editor/libeditor/base/nsStyleSheetTxns.h
editor/libeditor/base/tests/chrome.ini
editor/libeditor/base/tests/file_bug586662.html
editor/libeditor/base/tests/mochitest.ini
editor/libeditor/base/tests/moz.build
editor/libeditor/base/tests/test_bug408231.html
editor/libeditor/base/tests/test_bug46555.html
editor/libeditor/base/tests/test_bug502673.html
editor/libeditor/base/tests/test_bug514156.html
editor/libeditor/base/tests/test_bug567213.html
editor/libeditor/base/tests/test_bug586662.html
editor/libeditor/base/tests/test_bug599983.html
editor/libeditor/base/tests/test_bug599983.xul
editor/libeditor/base/tests/test_bug646194.xul
editor/libeditor/base/tests/test_bug742261.html
editor/libeditor/base/tests/test_bug773262.html
editor/libeditor/base/tests/test_bug795785.html
editor/libeditor/base/tests/test_dragdrop.html
editor/libeditor/base/tests/test_selection_move_commands.xul
editor/libeditor/crashtests/336104.html
editor/libeditor/crashtests/382527-1.html
editor/libeditor/crashtests/402172-1.html
editor/libeditor/crashtests/407079-1.html
editor/libeditor/crashtests/407256-1.html
editor/libeditor/crashtests/430624-1.html
editor/libeditor/crashtests/459613-iframe.html
editor/libeditor/crashtests/459613.html
editor/libeditor/crashtests/475132-1.xhtml
editor/libeditor/crashtests/633709.xhtml
editor/libeditor/crashtests/636074-1.html
editor/libeditor/crashtests/713427-1.html
editor/libeditor/crashtests/713427-2.xhtml
editor/libeditor/crashtests/762183.html
editor/libeditor/crashtests/766360.html
editor/libeditor/crashtests/766413.html
editor/libeditor/crashtests/766845.xhtml
editor/libeditor/crashtests/768765.html
editor/libeditor/crashtests/771749.html
editor/libeditor/crashtests/772282.html
editor/libeditor/crashtests/776323.html
editor/libeditor/crashtests/crashtests.list
editor/libeditor/html/moz.build
editor/libeditor/moz.build
editor/libeditor/nsEditProperty.h
editor/libeditor/nsEditPropertyAtomList.h
editor/libeditor/nsEditRules.h
editor/libeditor/nsEditor.cpp
editor/libeditor/nsEditor.h
editor/libeditor/nsEditorCommands.cpp
editor/libeditor/nsEditorCommands.h
editor/libeditor/nsEditorController.cpp
editor/libeditor/nsEditorController.h
editor/libeditor/nsEditorEventListener.cpp
editor/libeditor/nsEditorEventListener.h
editor/libeditor/nsEditorUtils.cpp
editor/libeditor/nsEditorUtils.h
editor/libeditor/nsIAbsorbingTransaction.h
editor/libeditor/nsSelectionState.cpp
editor/libeditor/nsSelectionState.h
editor/libeditor/nsStyleSheetTxns.cpp
editor/libeditor/nsStyleSheetTxns.h
editor/libeditor/tests/chrome.ini
editor/libeditor/tests/file_bug586662.html
editor/libeditor/tests/mochitest.ini
editor/libeditor/tests/moz.build
editor/libeditor/tests/test_bug408231.html
editor/libeditor/tests/test_bug46555.html
editor/libeditor/tests/test_bug502673.html
editor/libeditor/tests/test_bug514156.html
editor/libeditor/tests/test_bug567213.html
editor/libeditor/tests/test_bug586662.html
editor/libeditor/tests/test_bug599983.html
editor/libeditor/tests/test_bug599983.xul
editor/libeditor/tests/test_bug646194.xul
editor/libeditor/tests/test_bug742261.html
editor/libeditor/tests/test_bug773262.html
editor/libeditor/tests/test_bug795785.html
editor/libeditor/tests/test_dragdrop.html
editor/libeditor/tests/test_selection_move_commands.xul
editor/libeditor/text/moz.build
extensions/spellcheck/hunspell/src/moz.build
extensions/spellcheck/src/moz.build
layout/build/moz.build
layout/forms/moz.build
toolkit/content/license.html
--- a/content/html/content/src/moz.build
+++ b/content/html/content/src/moz.build
@@ -168,17 +168,17 @@ FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/canvas/src',
     '/content/html/document/src',
     '/content/media/',
     '/content/xul/content/src',
     '/dom/base',
     '/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/crashtests/crashtests.list
 include libeditor/html/crashtests/crashtests.list
-include libeditor/base/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 = 'gklayout'
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,19 +24,19 @@ UNIFIED_SOURCES += [
     'nsWSRunObject.cpp',
     'TextEditorTest.cpp',
     'TypeInState.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
-    '../base',
-    '../text',
     '/content/base/src',
+    '/editor/libeditor',
+    '/editor/libeditor/text',
     '/editor/txmgr',
     '/layout/generic',
     '/layout/style',
     '/layout/tables',
     '/layout/xul',
 ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/editor/libeditor/moz.build
+++ b/editor/libeditor/moz.build
@@ -1,7 +1,45 @@
 # -*- 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/.
 
-PARALLEL_DIRS += ['base', 'text', 'html']
+PARALLEL_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/libeditor/text',
+    '/editor/txmgr',
+    '/extensions/spellcheck/src',
+    '/layout/style',
+]
+
+FINAL_LIBRARY = 'gklayout'
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_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,18 +11,18 @@ UNIFIED_SOURCES += [
     'nsTextEditRules.cpp',
     'nsTextEditRulesBidi.cpp',
     'nsTextEditUtils.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
-    '../base',
     '/content/base/src',
+    '/editor/libeditor',
     '/editor/txmgr',
 ]
 
 FINAL_LIBRARY = 'gklayout'
 
 MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
 
 MOCHITEST_CHROME_MANIFESTS += ['tests/chrome.ini']
--- a/extensions/spellcheck/hunspell/src/moz.build
+++ b/extensions/spellcheck/hunspell/src/moz.build
@@ -29,14 +29,14 @@ if not CONFIG['MOZ_NATIVE_HUNSPELL']:
 
 FINAL_LIBRARY = 'spellchecker'
 
 LOCAL_INCLUDES += [
     '/extensions/spellcheck/src',
 ]
 
 LOCAL_INCLUDES += [
-    '/editor/libeditor/base',
+    '/editor/libeditor',
 ]
 
 # Suppress warnings in third-party code.
 if CONFIG['CLANG_CXX']:
     CXXFLAGS += ['-Wno-unused-private-field']
--- a/extensions/spellcheck/src/moz.build
+++ b/extensions/spellcheck/src/moz.build
@@ -17,10 +17,10 @@ UNIFIED_SOURCES += [
 
 LIBRARY_NAME = 'spellchecker'
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../hunspell/src',
     '/content/base/src',
-    '/editor/libeditor/base',
+    '/editor/libeditor',
 ]
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -62,17 +62,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 = 'gklayout'
 
 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
@@ -1936,17 +1936,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>.