diff --git a/browser/base/Makefile.in b/browser/base/Makefile.in
index df14dfeddfa..3523ab62895 100644
--- a/browser/base/Makefile.in
+++ b/browser/base/Makefile.in
@@ -83,6 +83,3 @@ endif
 ifneq (,$(filter windows gtk2, $(MOZ_WIDGET_TOOLKIT)))
 DEFINES += -DMENUBAR_CAN_AUTOHIDE=1
 endif
-
-libs::
-	$(NSINSTALL) $(srcdir)/content/tabview/modules/* $(FINAL_TARGET)/modules/tabview
diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index 724c6be831d..1ac7b6fda93 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -40,10 +40,6 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 relativesrcdir  = browser/base/content/test
 
-DIRS += \
-		tabview \
-		$(NULL)
-
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
index 8f7cc13010a..e492eed48f6 100644
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -49,10 +49,6 @@ browser.jar:
         content/browser/sanitizeDialog.css            (content/sanitizeDialog.css)
 *       content/browser/tabbrowser.css                (content/tabbrowser.css)
 *       content/browser/tabbrowser.xml                (content/tabbrowser.xml)
-        content/browser/tabview.css                   (content/tabview/tabview.css)
-*       content/browser/tabview.js                    (content/tabview/tabview.js)
-        content/browser/tabview.html                  (content/tabview/tabview.html)
-        content/browser/tabview-content.js            (content/tabview/content.js)
 *       content/browser/urlbarBindings.xml            (content/urlbarBindings.xml)
 *       content/browser/utilityOverlay.js             (content/utilityOverlay.js)
 *       content/browser/web-panels.js                 (content/web-panels.js)
diff --git a/browser/components/Makefile.in b/browser/components/Makefile.in
index 4c2a3a296a9..c5a87da2e11 100644
--- a/browser/components/Makefile.in
+++ b/browser/components/Makefile.in
@@ -69,7 +69,8 @@ PARALLEL_DIRS = \
   search \
   sessionstore \
   shell \
-  sidebar/src \
+  sidebar \
+  tabview \
   migration \
   $(NULL)
 
diff --git a/browser/components/tabview/Makefile.in b/browser/components/tabview/Makefile.in
new file mode 100644
index 00000000000..c86fb752212
--- /dev/null
+++ b/browser/components/tabview/Makefile.in
@@ -0,0 +1,53 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Places code
+#
+# The Initial Developer of the Original Code is
+# Google Inc.
+# Portions created by the Initial Developer are Copyright (C) 2005
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Brett Wilson <brettw@gmail.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+ifdef ENABLE_TESTS
+	DIRS += test
+endif
+
+include $(topsrcdir)/config/rules.mk
+
+libs::
+	$(NSINSTALL) $(srcdir)/modules/* $(FINAL_TARGET)/modules/tabview
diff --git a/browser/base/content/tabview/content.js b/browser/components/tabview/content.js
similarity index 100%
rename from browser/base/content/tabview/content.js
rename to browser/components/tabview/content.js
diff --git a/browser/base/content/tabview/drag.js b/browser/components/tabview/drag.js
similarity index 100%
rename from browser/base/content/tabview/drag.js
rename to browser/components/tabview/drag.js
diff --git a/browser/base/content/tabview/groupitems.js b/browser/components/tabview/groupitems.js
similarity index 100%
rename from browser/base/content/tabview/groupitems.js
rename to browser/components/tabview/groupitems.js
diff --git a/browser/base/content/tabview/iq.js b/browser/components/tabview/iq.js
similarity index 100%
rename from browser/base/content/tabview/iq.js
rename to browser/components/tabview/iq.js
diff --git a/browser/base/content/tabview/items.js b/browser/components/tabview/items.js
similarity index 100%
rename from browser/base/content/tabview/items.js
rename to browser/components/tabview/items.js
diff --git a/browser/components/tabview/jar.mn b/browser/components/tabview/jar.mn
new file mode 100644
index 00000000000..7b54b18afd9
--- /dev/null
+++ b/browser/components/tabview/jar.mn
@@ -0,0 +1,5 @@
+browser.jar:
+        content/browser/tabview.css                   (tabview.css)
+*       content/browser/tabview.js                    (tabview.js)
+        content/browser/tabview.html                  (tabview.html)
+        content/browser/tabview-content.js            (content.js)
diff --git a/browser/base/content/tabview/modules/utils.jsm b/browser/components/tabview/modules/utils.jsm
similarity index 100%
rename from browser/base/content/tabview/modules/utils.jsm
rename to browser/components/tabview/modules/utils.jsm
diff --git a/browser/base/content/tabview/search.js b/browser/components/tabview/search.js
similarity index 100%
rename from browser/base/content/tabview/search.js
rename to browser/components/tabview/search.js
diff --git a/browser/base/content/tabview/storage.js b/browser/components/tabview/storage.js
similarity index 100%
rename from browser/base/content/tabview/storage.js
rename to browser/components/tabview/storage.js
diff --git a/browser/base/content/tabview/storagePolicy.js b/browser/components/tabview/storagePolicy.js
similarity index 100%
rename from browser/base/content/tabview/storagePolicy.js
rename to browser/components/tabview/storagePolicy.js
diff --git a/browser/base/content/tabview/tabitems.js b/browser/components/tabview/tabitems.js
similarity index 100%
rename from browser/base/content/tabview/tabitems.js
rename to browser/components/tabview/tabitems.js
diff --git a/browser/base/content/tabview/tabview.css b/browser/components/tabview/tabview.css
similarity index 100%
rename from browser/base/content/tabview/tabview.css
rename to browser/components/tabview/tabview.css
diff --git a/browser/base/content/tabview/tabview.html b/browser/components/tabview/tabview.html
similarity index 100%
rename from browser/base/content/tabview/tabview.html
rename to browser/components/tabview/tabview.html
diff --git a/browser/base/content/tabview/tabview.js b/browser/components/tabview/tabview.js
similarity index 100%
rename from browser/base/content/tabview/tabview.js
rename to browser/components/tabview/tabview.js
diff --git a/browser/base/content/test/tabview/Makefile.in b/browser/components/tabview/test/Makefile.in
similarity index 99%
rename from browser/base/content/test/tabview/Makefile.in
rename to browser/components/tabview/test/Makefile.in
index 785606e0cbc..81807e1cce1 100644
--- a/browser/base/content/test/tabview/Makefile.in
+++ b/browser/components/tabview/test/Makefile.in
@@ -34,11 +34,11 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = browser/base/content/test/tabview
+relativesrcdir  = browser/components/tabview/test
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/base/content/test/tabview/browser_tabview_alltabs.js b/browser/components/tabview/test/browser_tabview_alltabs.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_alltabs.js
rename to browser/components/tabview/test/browser_tabview_alltabs.js
diff --git a/browser/base/content/test/tabview/browser_tabview_apptabs.js b/browser/components/tabview/test/browser_tabview_apptabs.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_apptabs.js
rename to browser/components/tabview/test/browser_tabview_apptabs.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug580412.js b/browser/components/tabview/test/browser_tabview_bug580412.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug580412.js
rename to browser/components/tabview/test/browser_tabview_bug580412.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug586553.js b/browser/components/tabview/test/browser_tabview_bug586553.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug586553.js
rename to browser/components/tabview/test/browser_tabview_bug586553.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug587043.js b/browser/components/tabview/test/browser_tabview_bug587043.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug587043.js
rename to browser/components/tabview/test/browser_tabview_bug587043.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug587231.js b/browser/components/tabview/test/browser_tabview_bug587231.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug587231.js
rename to browser/components/tabview/test/browser_tabview_bug587231.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug587276.js b/browser/components/tabview/test/browser_tabview_bug587276.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug587276.js
rename to browser/components/tabview/test/browser_tabview_bug587276.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug587351.js b/browser/components/tabview/test/browser_tabview_bug587351.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug587351.js
rename to browser/components/tabview/test/browser_tabview_bug587351.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug587503.js b/browser/components/tabview/test/browser_tabview_bug587503.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug587503.js
rename to browser/components/tabview/test/browser_tabview_bug587503.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug587990.js b/browser/components/tabview/test/browser_tabview_bug587990.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug587990.js
rename to browser/components/tabview/test/browser_tabview_bug587990.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug588265.js b/browser/components/tabview/test/browser_tabview_bug588265.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug588265.js
rename to browser/components/tabview/test/browser_tabview_bug588265.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug589324.js b/browser/components/tabview/test/browser_tabview_bug589324.js
similarity index 96%
rename from browser/base/content/test/tabview/browser_tabview_bug589324.js
rename to browser/components/tabview/test/browser_tabview_bug589324.js
index a70dffdbc0f..43d590bb612 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug589324.js
+++ b/browser/components/tabview/test/browser_tabview_bug589324.js
@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-const DUMMY_PAGE_URL = "http://mochi.test:8888/browser/browser/base/content/test/tabview/dummy_page.html";
+const DUMMY_PAGE_URL = "http://mochi.test:8888/browser/browser/components/tabview/test/dummy_page.html";
 const DUMMY_PAGE_URL_2 = "http://mochi.test:8888/";
 
 let state = {
diff --git a/browser/base/content/test/tabview/browser_tabview_bug590606.js b/browser/components/tabview/test/browser_tabview_bug590606.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug590606.js
rename to browser/components/tabview/test/browser_tabview_bug590606.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug591706.js b/browser/components/tabview/test/browser_tabview_bug591706.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug591706.js
rename to browser/components/tabview/test/browser_tabview_bug591706.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug593283.js b/browser/components/tabview/test/browser_tabview_bug593283.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug593283.js
rename to browser/components/tabview/test/browser_tabview_bug593283.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug594958.js b/browser/components/tabview/test/browser_tabview_bug594958.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug594958.js
rename to browser/components/tabview/test/browser_tabview_bug594958.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug595020.js b/browser/components/tabview/test/browser_tabview_bug595020.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug595020.js
rename to browser/components/tabview/test/browser_tabview_bug595020.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug595191.js b/browser/components/tabview/test/browser_tabview_bug595191.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug595191.js
rename to browser/components/tabview/test/browser_tabview_bug595191.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug595436.js b/browser/components/tabview/test/browser_tabview_bug595436.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug595436.js
rename to browser/components/tabview/test/browser_tabview_bug595436.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug595518.js b/browser/components/tabview/test/browser_tabview_bug595518.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug595518.js
rename to browser/components/tabview/test/browser_tabview_bug595518.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug595521.js b/browser/components/tabview/test/browser_tabview_bug595521.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug595521.js
rename to browser/components/tabview/test/browser_tabview_bug595521.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug595560.js b/browser/components/tabview/test/browser_tabview_bug595560.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug595560.js
rename to browser/components/tabview/test/browser_tabview_bug595560.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug595601.js b/browser/components/tabview/test/browser_tabview_bug595601.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug595601.js
rename to browser/components/tabview/test/browser_tabview_bug595601.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug595804.js b/browser/components/tabview/test/browser_tabview_bug595804.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug595804.js
rename to browser/components/tabview/test/browser_tabview_bug595804.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug595930.js b/browser/components/tabview/test/browser_tabview_bug595930.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug595930.js
rename to browser/components/tabview/test/browser_tabview_bug595930.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug595943.js b/browser/components/tabview/test/browser_tabview_bug595943.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug595943.js
rename to browser/components/tabview/test/browser_tabview_bug595943.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug595965.js b/browser/components/tabview/test/browser_tabview_bug595965.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug595965.js
rename to browser/components/tabview/test/browser_tabview_bug595965.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug596781.js b/browser/components/tabview/test/browser_tabview_bug596781.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug596781.js
rename to browser/components/tabview/test/browser_tabview_bug596781.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug597248.js b/browser/components/tabview/test/browser_tabview_bug597248.js
similarity index 95%
rename from browser/base/content/test/tabview/browser_tabview_bug597248.js
rename to browser/components/tabview/test/browser_tabview_bug597248.js
index eeb8dfe0f55..98490c1b29f 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug597248.js
+++ b/browser/components/tabview/test/browser_tabview_bug597248.js
@@ -16,8 +16,8 @@ function test() {
 function setupOne(win) {
   win.TabView.firstUseExperienced = true;
 
-  win.gBrowser.addTab("http://mochi.test:8888/browser/browser/base/content/test/tabview/search1.html");
-  win.gBrowser.addTab("http://mochi.test:8888/browser/browser/base/content/test/tabview/dummy_page.html");
+  win.gBrowser.addTab("http://mochi.test:8888/browser/browser/components/tabview/test/search1.html");
+  win.gBrowser.addTab("http://mochi.test:8888/browser/browser/components/tabview/test/dummy_page.html");
 
   afterAllTabsLoaded(function () setupTwo(win), win);
 }
diff --git a/browser/base/content/test/tabview/browser_tabview_bug597360.js b/browser/components/tabview/test/browser_tabview_bug597360.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug597360.js
rename to browser/components/tabview/test/browser_tabview_bug597360.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug597399.js b/browser/components/tabview/test/browser_tabview_bug597399.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug597399.js
rename to browser/components/tabview/test/browser_tabview_bug597399.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug597980.js b/browser/components/tabview/test/browser_tabview_bug597980.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug597980.js
rename to browser/components/tabview/test/browser_tabview_bug597980.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug598375.js b/browser/components/tabview/test/browser_tabview_bug598375.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug598375.js
rename to browser/components/tabview/test/browser_tabview_bug598375.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug598600.js b/browser/components/tabview/test/browser_tabview_bug598600.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug598600.js
rename to browser/components/tabview/test/browser_tabview_bug598600.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug599626.js b/browser/components/tabview/test/browser_tabview_bug599626.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug599626.js
rename to browser/components/tabview/test/browser_tabview_bug599626.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug600645.js b/browser/components/tabview/test/browser_tabview_bug600645.js
similarity index 96%
rename from browser/base/content/test/tabview/browser_tabview_bug600645.js
rename to browser/components/tabview/test/browser_tabview_bug600645.js
index 8ee342e38ce..f079af74463 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug600645.js
+++ b/browser/components/tabview/test/browser_tabview_bug600645.js
@@ -68,5 +68,5 @@ function onTabViewWindowLoaded() {
   newTab.addEventListener("error", errorHandler, false);
 
   newTab.linkedBrowser.loadURI(
-    "http://mochi.test:8888/browser/browser/base/content/test/tabview/test_bug600645.html");
+    "http://mochi.test:8888/browser/browser/components/tabview/test/test_bug600645.html");
 }
diff --git a/browser/base/content/test/tabview/browser_tabview_bug600812.js b/browser/components/tabview/test/browser_tabview_bug600812.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug600812.js
rename to browser/components/tabview/test/browser_tabview_bug600812.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug602432.js b/browser/components/tabview/test/browser_tabview_bug602432.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug602432.js
rename to browser/components/tabview/test/browser_tabview_bug602432.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug604098.js b/browser/components/tabview/test/browser_tabview_bug604098.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug604098.js
rename to browser/components/tabview/test/browser_tabview_bug604098.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug606657.js b/browser/components/tabview/test/browser_tabview_bug606657.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug606657.js
rename to browser/components/tabview/test/browser_tabview_bug606657.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug606905.js b/browser/components/tabview/test/browser_tabview_bug606905.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug606905.js
rename to browser/components/tabview/test/browser_tabview_bug606905.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug607108.js b/browser/components/tabview/test/browser_tabview_bug607108.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug607108.js
rename to browser/components/tabview/test/browser_tabview_bug607108.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug608037.js b/browser/components/tabview/test/browser_tabview_bug608037.js
similarity index 96%
rename from browser/base/content/test/tabview/browser_tabview_bug608037.js
rename to browser/components/tabview/test/browser_tabview_bug608037.js
index 37b2f5f9691..8e02d611fed 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug608037.js
+++ b/browser/components/tabview/test/browser_tabview_bug608037.js
@@ -8,7 +8,7 @@ function test() {
   waitForExplicitFinish();
 
   tabOne = gBrowser.addTab("http://mochi.test:8888/");
-  tabTwo = gBrowser.addTab("http://mochi.test:8888/browser/browser/base/content/test/tabview/dummy_page.html");
+  tabTwo = gBrowser.addTab("http://mochi.test:8888/browser/browser/components/tabview/test/dummy_page.html");
 
   afterAllTabsLoaded(function () {
     // make sure the tab one is selected because undoCloseTab() would remove
diff --git a/browser/base/content/test/tabview/browser_tabview_bug608158.js b/browser/components/tabview/test/browser_tabview_bug608158.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug608158.js
rename to browser/components/tabview/test/browser_tabview_bug608158.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug608184.js b/browser/components/tabview/test/browser_tabview_bug608184.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug608184.js
rename to browser/components/tabview/test/browser_tabview_bug608184.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug608405.js b/browser/components/tabview/test/browser_tabview_bug608405.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug608405.js
rename to browser/components/tabview/test/browser_tabview_bug608405.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug610208.js b/browser/components/tabview/test/browser_tabview_bug610208.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug610208.js
rename to browser/components/tabview/test/browser_tabview_bug610208.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug610242.js b/browser/components/tabview/test/browser_tabview_bug610242.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug610242.js
rename to browser/components/tabview/test/browser_tabview_bug610242.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug612470.js b/browser/components/tabview/test/browser_tabview_bug612470.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug612470.js
rename to browser/components/tabview/test/browser_tabview_bug612470.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug613541.js b/browser/components/tabview/test/browser_tabview_bug613541.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug613541.js
rename to browser/components/tabview/test/browser_tabview_bug613541.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug616729.js b/browser/components/tabview/test/browser_tabview_bug616729.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug616729.js
rename to browser/components/tabview/test/browser_tabview_bug616729.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug616967.js b/browser/components/tabview/test/browser_tabview_bug616967.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug616967.js
rename to browser/components/tabview/test/browser_tabview_bug616967.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug618816.js b/browser/components/tabview/test/browser_tabview_bug618816.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug618816.js
rename to browser/components/tabview/test/browser_tabview_bug618816.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug618828.js b/browser/components/tabview/test/browser_tabview_bug618828.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug618828.js
rename to browser/components/tabview/test/browser_tabview_bug618828.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug619937.js b/browser/components/tabview/test/browser_tabview_bug619937.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug619937.js
rename to browser/components/tabview/test/browser_tabview_bug619937.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug622835.js b/browser/components/tabview/test/browser_tabview_bug622835.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug622835.js
rename to browser/components/tabview/test/browser_tabview_bug622835.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug623768.js b/browser/components/tabview/test/browser_tabview_bug623768.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug623768.js
rename to browser/components/tabview/test/browser_tabview_bug623768.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug624265.js b/browser/components/tabview/test/browser_tabview_bug624265.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug624265.js
rename to browser/components/tabview/test/browser_tabview_bug624265.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug624692.js b/browser/components/tabview/test/browser_tabview_bug624692.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug624692.js
rename to browser/components/tabview/test/browser_tabview_bug624692.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug624727.js b/browser/components/tabview/test/browser_tabview_bug624727.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug624727.js
rename to browser/components/tabview/test/browser_tabview_bug624727.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug624847.js b/browser/components/tabview/test/browser_tabview_bug624847.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug624847.js
rename to browser/components/tabview/test/browser_tabview_bug624847.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug624931.js b/browser/components/tabview/test/browser_tabview_bug624931.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug624931.js
rename to browser/components/tabview/test/browser_tabview_bug624931.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug624953.js b/browser/components/tabview/test/browser_tabview_bug624953.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug624953.js
rename to browser/components/tabview/test/browser_tabview_bug624953.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug625195.js b/browser/components/tabview/test/browser_tabview_bug625195.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug625195.js
rename to browser/components/tabview/test/browser_tabview_bug625195.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug625269.js b/browser/components/tabview/test/browser_tabview_bug625269.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug625269.js
rename to browser/components/tabview/test/browser_tabview_bug625269.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug625424.js b/browser/components/tabview/test/browser_tabview_bug625424.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug625424.js
rename to browser/components/tabview/test/browser_tabview_bug625424.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug625955.js b/browser/components/tabview/test/browser_tabview_bug625955.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug625955.js
rename to browser/components/tabview/test/browser_tabview_bug625955.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug626368.js b/browser/components/tabview/test/browser_tabview_bug626368.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug626368.js
rename to browser/components/tabview/test/browser_tabview_bug626368.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug626455.js b/browser/components/tabview/test/browser_tabview_bug626455.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug626455.js
rename to browser/components/tabview/test/browser_tabview_bug626455.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug626525.js b/browser/components/tabview/test/browser_tabview_bug626525.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug626525.js
rename to browser/components/tabview/test/browser_tabview_bug626525.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug626791.js b/browser/components/tabview/test/browser_tabview_bug626791.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug626791.js
rename to browser/components/tabview/test/browser_tabview_bug626791.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug627288.js b/browser/components/tabview/test/browser_tabview_bug627288.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug627288.js
rename to browser/components/tabview/test/browser_tabview_bug627288.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug627736.js b/browser/components/tabview/test/browser_tabview_bug627736.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug627736.js
rename to browser/components/tabview/test/browser_tabview_bug627736.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug628061.js b/browser/components/tabview/test/browser_tabview_bug628061.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug628061.js
rename to browser/components/tabview/test/browser_tabview_bug628061.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug628165.js b/browser/components/tabview/test/browser_tabview_bug628165.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug628165.js
rename to browser/components/tabview/test/browser_tabview_bug628165.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug628270.js b/browser/components/tabview/test/browser_tabview_bug628270.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug628270.js
rename to browser/components/tabview/test/browser_tabview_bug628270.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug628887.js b/browser/components/tabview/test/browser_tabview_bug628887.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug628887.js
rename to browser/components/tabview/test/browser_tabview_bug628887.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug629189.js b/browser/components/tabview/test/browser_tabview_bug629189.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug629189.js
rename to browser/components/tabview/test/browser_tabview_bug629189.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug629195.js b/browser/components/tabview/test/browser_tabview_bug629195.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug629195.js
rename to browser/components/tabview/test/browser_tabview_bug629195.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug630102.js b/browser/components/tabview/test/browser_tabview_bug630102.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug630102.js
rename to browser/components/tabview/test/browser_tabview_bug630102.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug630157.js b/browser/components/tabview/test/browser_tabview_bug630157.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug630157.js
rename to browser/components/tabview/test/browser_tabview_bug630157.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug631662.js b/browser/components/tabview/test/browser_tabview_bug631662.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug631662.js
rename to browser/components/tabview/test/browser_tabview_bug631662.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug631752.js b/browser/components/tabview/test/browser_tabview_bug631752.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug631752.js
rename to browser/components/tabview/test/browser_tabview_bug631752.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug633190.js b/browser/components/tabview/test/browser_tabview_bug633190.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug633190.js
rename to browser/components/tabview/test/browser_tabview_bug633190.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug633788.js b/browser/components/tabview/test/browser_tabview_bug633788.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug633788.js
rename to browser/components/tabview/test/browser_tabview_bug633788.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug634077.js b/browser/components/tabview/test/browser_tabview_bug634077.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug634077.js
rename to browser/components/tabview/test/browser_tabview_bug634077.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug634085.js b/browser/components/tabview/test/browser_tabview_bug634085.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug634085.js
rename to browser/components/tabview/test/browser_tabview_bug634085.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug634672.js b/browser/components/tabview/test/browser_tabview_bug634672.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug634672.js
rename to browser/components/tabview/test/browser_tabview_bug634672.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug635696.js b/browser/components/tabview/test/browser_tabview_bug635696.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug635696.js
rename to browser/components/tabview/test/browser_tabview_bug635696.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug637840.js b/browser/components/tabview/test/browser_tabview_bug637840.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug637840.js
rename to browser/components/tabview/test/browser_tabview_bug637840.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug640765.js b/browser/components/tabview/test/browser_tabview_bug640765.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug640765.js
rename to browser/components/tabview/test/browser_tabview_bug640765.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug641802.js b/browser/components/tabview/test/browser_tabview_bug641802.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug641802.js
rename to browser/components/tabview/test/browser_tabview_bug641802.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug642793.js b/browser/components/tabview/test/browser_tabview_bug642793.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug642793.js
rename to browser/components/tabview/test/browser_tabview_bug642793.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug643392.js b/browser/components/tabview/test/browser_tabview_bug643392.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug643392.js
rename to browser/components/tabview/test/browser_tabview_bug643392.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug644097.js b/browser/components/tabview/test/browser_tabview_bug644097.js
similarity index 94%
rename from browser/base/content/test/tabview/browser_tabview_bug644097.js
rename to browser/components/tabview/test/browser_tabview_bug644097.js
index 2d44da65ef3..3d8fabb475f 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug644097.js
+++ b/browser/components/tabview/test/browser_tabview_bug644097.js
@@ -12,7 +12,7 @@ function test() {
 
     // create some tabs with favIcons
     for (let i = 0; i < 3; i++)
-      win.gBrowser.loadOneTab("http://mochi.test:8888/browser/browser/base/content/test/tabview/test_bug644097.html", {inBackground: true});
+      win.gBrowser.loadOneTab("http://mochi.test:8888/browser/browser/components/tabview/test/test_bug644097.html", {inBackground: true});
 
     win.gBrowser.removeTab(win.gBrowser.tabs[0]);
 
diff --git a/browser/base/content/test/tabview/browser_tabview_bug648882.js b/browser/components/tabview/test/browser_tabview_bug648882.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug648882.js
rename to browser/components/tabview/test/browser_tabview_bug648882.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug649006.js b/browser/components/tabview/test/browser_tabview_bug649006.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug649006.js
rename to browser/components/tabview/test/browser_tabview_bug649006.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug649307.js b/browser/components/tabview/test/browser_tabview_bug649307.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug649307.js
rename to browser/components/tabview/test/browser_tabview_bug649307.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug649319.js b/browser/components/tabview/test/browser_tabview_bug649319.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug649319.js
rename to browser/components/tabview/test/browser_tabview_bug649319.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug650280.js b/browser/components/tabview/test/browser_tabview_bug650280.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug650280.js
rename to browser/components/tabview/test/browser_tabview_bug650280.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug650573.js b/browser/components/tabview/test/browser_tabview_bug650573.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug650573.js
rename to browser/components/tabview/test/browser_tabview_bug650573.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug651311.js b/browser/components/tabview/test/browser_tabview_bug651311.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug651311.js
rename to browser/components/tabview/test/browser_tabview_bug651311.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug654721.js b/browser/components/tabview/test/browser_tabview_bug654721.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug654721.js
rename to browser/components/tabview/test/browser_tabview_bug654721.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug654941.js b/browser/components/tabview/test/browser_tabview_bug654941.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug654941.js
rename to browser/components/tabview/test/browser_tabview_bug654941.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug655269.js b/browser/components/tabview/test/browser_tabview_bug655269.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug655269.js
rename to browser/components/tabview/test/browser_tabview_bug655269.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug656778.js b/browser/components/tabview/test/browser_tabview_bug656778.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug656778.js
rename to browser/components/tabview/test/browser_tabview_bug656778.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug656913.js b/browser/components/tabview/test/browser_tabview_bug656913.js
similarity index 93%
rename from browser/base/content/test/tabview/browser_tabview_bug656913.js
rename to browser/components/tabview/test/browser_tabview_bug656913.js
index e45a3c64fc4..e20e4ae3821 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug656913.js
+++ b/browser/components/tabview/test/browser_tabview_bug656913.js
@@ -5,7 +5,7 @@
 function test() {
   waitForExplicitFinish();
 
-  let urlBase = "http://mochi.test:8888/browser/browser/base/content/test/tabview/";
+  let urlBase = "http://mochi.test:8888/browser/browser/components/tabview/test/";
   let newTab = gBrowser.addTab(urlBase + "search1.html");
 
   registerCleanupFunction(function() {
diff --git a/browser/base/content/test/tabview/browser_tabview_bug662266.js b/browser/components/tabview/test/browser_tabview_bug662266.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug662266.js
rename to browser/components/tabview/test/browser_tabview_bug662266.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug663421.js b/browser/components/tabview/test/browser_tabview_bug663421.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug663421.js
rename to browser/components/tabview/test/browser_tabview_bug663421.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug665502.js b/browser/components/tabview/test/browser_tabview_bug665502.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug665502.js
rename to browser/components/tabview/test/browser_tabview_bug665502.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug669694.js b/browser/components/tabview/test/browser_tabview_bug669694.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug669694.js
rename to browser/components/tabview/test/browser_tabview_bug669694.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug673196.js b/browser/components/tabview/test/browser_tabview_bug673196.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug673196.js
rename to browser/components/tabview/test/browser_tabview_bug673196.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug673729.js b/browser/components/tabview/test/browser_tabview_bug673729.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug673729.js
rename to browser/components/tabview/test/browser_tabview_bug673729.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug677310.js b/browser/components/tabview/test/browser_tabview_bug677310.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug677310.js
rename to browser/components/tabview/test/browser_tabview_bug677310.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug679853.js b/browser/components/tabview/test/browser_tabview_bug679853.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug679853.js
rename to browser/components/tabview/test/browser_tabview_bug679853.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug681599.js b/browser/components/tabview/test/browser_tabview_bug681599.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug681599.js
rename to browser/components/tabview/test/browser_tabview_bug681599.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug685476.js b/browser/components/tabview/test/browser_tabview_bug685476.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug685476.js
rename to browser/components/tabview/test/browser_tabview_bug685476.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug685692.js b/browser/components/tabview/test/browser_tabview_bug685692.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug685692.js
rename to browser/components/tabview/test/browser_tabview_bug685692.js
diff --git a/browser/base/content/test/tabview/browser_tabview_bug686654.js b/browser/components/tabview/test/browser_tabview_bug686654.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_bug686654.js
rename to browser/components/tabview/test/browser_tabview_bug686654.js
diff --git a/browser/base/content/test/tabview/browser_tabview_click_group.js b/browser/components/tabview/test/browser_tabview_click_group.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_click_group.js
rename to browser/components/tabview/test/browser_tabview_click_group.js
diff --git a/browser/base/content/test/tabview/browser_tabview_dragdrop.js b/browser/components/tabview/test/browser_tabview_dragdrop.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_dragdrop.js
rename to browser/components/tabview/test/browser_tabview_dragdrop.js
diff --git a/browser/base/content/test/tabview/browser_tabview_exit_button.js b/browser/components/tabview/test/browser_tabview_exit_button.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_exit_button.js
rename to browser/components/tabview/test/browser_tabview_exit_button.js
diff --git a/browser/base/content/test/tabview/browser_tabview_expander.js b/browser/components/tabview/test/browser_tabview_expander.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_expander.js
rename to browser/components/tabview/test/browser_tabview_expander.js
diff --git a/browser/base/content/test/tabview/browser_tabview_firstrun_pref.js b/browser/components/tabview/test/browser_tabview_firstrun_pref.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_firstrun_pref.js
rename to browser/components/tabview/test/browser_tabview_firstrun_pref.js
diff --git a/browser/base/content/test/tabview/browser_tabview_group.js b/browser/components/tabview/test/browser_tabview_group.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_group.js
rename to browser/components/tabview/test/browser_tabview_group.js
diff --git a/browser/base/content/test/tabview/browser_tabview_launch.js b/browser/components/tabview/test/browser_tabview_launch.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_launch.js
rename to browser/components/tabview/test/browser_tabview_launch.js
diff --git a/browser/base/content/test/tabview/browser_tabview_layout.js b/browser/components/tabview/test/browser_tabview_layout.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_layout.js
rename to browser/components/tabview/test/browser_tabview_layout.js
diff --git a/browser/base/content/test/tabview/browser_tabview_multiwindow_search.js b/browser/components/tabview/test/browser_tabview_multiwindow_search.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_multiwindow_search.js
rename to browser/components/tabview/test/browser_tabview_multiwindow_search.js
diff --git a/browser/base/content/test/tabview/browser_tabview_privatebrowsing.js b/browser/components/tabview/test/browser_tabview_privatebrowsing.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_privatebrowsing.js
rename to browser/components/tabview/test/browser_tabview_privatebrowsing.js
diff --git a/browser/base/content/test/tabview/browser_tabview_rtl.js b/browser/components/tabview/test/browser_tabview_rtl.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_rtl.js
rename to browser/components/tabview/test/browser_tabview_rtl.js
diff --git a/browser/base/content/test/tabview/browser_tabview_search.js b/browser/components/tabview/test/browser_tabview_search.js
similarity index 98%
rename from browser/base/content/test/tabview/browser_tabview_search.js
rename to browser/components/tabview/test/browser_tabview_search.js
index 4096a14b2e5..29c8243670b 100644
--- a/browser/base/content/test/tabview/browser_tabview_search.js
+++ b/browser/components/tabview/test/browser_tabview_search.js
@@ -8,7 +8,7 @@ function test() {
   waitForExplicitFinish();
 
   // set up our tabs
-  let urlBase = "http://mochi.test:8888/browser/browser/base/content/test/tabview/";
+  let urlBase = "http://mochi.test:8888/browser/browser/components/tabview/test/";
   let tabOne = gBrowser.addTab(urlBase + "search1.html");
   let tabTwo = gBrowser.addTab(urlBase + "search2.html");
   newTabs = [ tabOne, tabTwo ];
diff --git a/browser/base/content/test/tabview/browser_tabview_snapping.js b/browser/components/tabview/test/browser_tabview_snapping.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_snapping.js
rename to browser/components/tabview/test/browser_tabview_snapping.js
diff --git a/browser/base/content/test/tabview/browser_tabview_startup_transitions.js b/browser/components/tabview/test/browser_tabview_startup_transitions.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_startup_transitions.js
rename to browser/components/tabview/test/browser_tabview_startup_transitions.js
diff --git a/browser/base/content/test/tabview/browser_tabview_storage_policy.js b/browser/components/tabview/test/browser_tabview_storage_policy.js
similarity index 97%
rename from browser/base/content/test/tabview/browser_tabview_storage_policy.js
rename to browser/components/tabview/test/browser_tabview_storage_policy.js
index 0d5347f3bdb..df14a77f7bc 100644
--- a/browser/base/content/test/tabview/browser_tabview_storage_policy.js
+++ b/browser/components/tabview/test/browser_tabview_storage_policy.js
@@ -48,7 +48,7 @@ function test1() {
     HttpRequestObserver.cacheControlValue = null;
   });
 
-  newTab.linkedBrowser.loadURI("http://www.example.com/browser/browser/base/content/test/tabview/dummy_page.html");
+  newTab.linkedBrowser.loadURI("http://www.example.com/browser/browser/components/tabview/test/dummy_page.html");
 }
 
 function test2() {
@@ -73,7 +73,7 @@ function test3() {
 
   Services.prefs.setBoolPref(PREF_DISK_CACHE_SSL, true);
 
-  newTab.linkedBrowser.loadURI("https://example.com/browser/browser/base/content/test/tabview/dummy_page.html");
+  newTab.linkedBrowser.loadURI("https://example.com/browser/browser/components/tabview/test/dummy_page.html");
   afterAllTabsLoaded(function() {
     let tabItem = newTab._tabViewTabItem;
 
@@ -91,7 +91,7 @@ function test4() {
 
   Services.prefs.setBoolPref(PREF_DISK_CACHE_SSL, false);
 
-  newTab.linkedBrowser.loadURI("https://example.com/browser/browser/base/content/test/tabview/");
+  newTab.linkedBrowser.loadURI("https://example.com/browser/browser/components/tabview/test/");
   afterAllTabsLoaded(function() {
     let tabItem = newTab._tabViewTabItem;
 
diff --git a/browser/base/content/test/tabview/browser_tabview_thumbnail_storage.js b/browser/components/tabview/test/browser_tabview_thumbnail_storage.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_thumbnail_storage.js
rename to browser/components/tabview/test/browser_tabview_thumbnail_storage.js
diff --git a/browser/base/content/test/tabview/browser_tabview_undo_group.js b/browser/components/tabview/test/browser_tabview_undo_group.js
similarity index 100%
rename from browser/base/content/test/tabview/browser_tabview_undo_group.js
rename to browser/components/tabview/test/browser_tabview_undo_group.js
diff --git a/browser/base/content/test/tabview/dummy_page.html b/browser/components/tabview/test/dummy_page.html
similarity index 100%
rename from browser/base/content/test/tabview/dummy_page.html
rename to browser/components/tabview/test/dummy_page.html
diff --git a/browser/base/content/test/tabview/head.js b/browser/components/tabview/test/head.js
similarity index 100%
rename from browser/base/content/test/tabview/head.js
rename to browser/components/tabview/test/head.js
diff --git a/browser/base/content/test/tabview/search1.html b/browser/components/tabview/test/search1.html
similarity index 100%
rename from browser/base/content/test/tabview/search1.html
rename to browser/components/tabview/test/search1.html
diff --git a/browser/base/content/test/tabview/search2.html b/browser/components/tabview/test/search2.html
similarity index 100%
rename from browser/base/content/test/tabview/search2.html
rename to browser/components/tabview/test/search2.html
diff --git a/browser/base/content/test/tabview/test_bug600645.html b/browser/components/tabview/test/test_bug600645.html
similarity index 100%
rename from browser/base/content/test/tabview/test_bug600645.html
rename to browser/components/tabview/test/test_bug600645.html
diff --git a/browser/base/content/test/tabview/test_bug644097.html b/browser/components/tabview/test/test_bug644097.html
similarity index 100%
rename from browser/base/content/test/tabview/test_bug644097.html
rename to browser/components/tabview/test/test_bug644097.html
diff --git a/browser/base/content/tabview/thumbnailStorage.js b/browser/components/tabview/thumbnailStorage.js
similarity index 100%
rename from browser/base/content/tabview/thumbnailStorage.js
rename to browser/components/tabview/thumbnailStorage.js
diff --git a/browser/base/content/tabview/trench.js b/browser/components/tabview/trench.js
similarity index 100%
rename from browser/base/content/tabview/trench.js
rename to browser/components/tabview/trench.js
diff --git a/browser/base/content/tabview/ui.js b/browser/components/tabview/ui.js
similarity index 100%
rename from browser/base/content/tabview/ui.js
rename to browser/components/tabview/ui.js