--- a/docshell/test/chrome/bug112564_window.xul
+++ b/docshell/test/chrome/bug112564_window.xul
@@ -106,10 +106,10 @@
                    {type: "pageshow", title: "test1", persisted: true}];
       gBrowser.goBack();
       yield undefined;
 
       finish();
     }
   ]]></script>
 
-  <browser type="content-primary" flex="1" id="content" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content" src="about:blank"/>
 </window>

--- a/docshell/test/chrome/bug215405_window.xul
+++ b/docshell/test/chrome/bug215405_window.xul
@@ -151,10 +151,10 @@
          " vertical axis scroll position not correctly restored");
       var formValue = gBrowser.contentDocument.getElementById("inp").value;
       is(formValue, text, testName + " form value not correctly restored");
       
       finish();
     }
   ]]></script>
 
-  <browser type="content-primary" flex="1" id="content" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content" src="about:blank"/>
 </window>

--- a/docshell/test/chrome/bug293235_window.xul
+++ b/docshell/test/chrome/bug293235_window.xul
@@ -151,10 +151,10 @@
          "visited link should be purple");
 
       // Tell the framework the test is finished.
       finish();
     }
 
   ]]></script>
 
-  <browser type="content-primary" flex="1" id="content" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content" src="about:blank"/>
 </window>

--- a/docshell/test/chrome/bug294258_window.xul
+++ b/docshell/test/chrome/bug294258_window.xul
@@ -65,10 +65,10 @@
       is($("select").selectedIndex, 2, "Select value changed");
 
       // Tell the framework the test is finished.
       finish();
     }
     
   ]]></script>
 
-  <browser type="content-primary" flex="1" id="content" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content" src="about:blank"/>
 </window>

--- a/docshell/test/chrome/bug298622_window.xul
+++ b/docshell/test/chrome/bug298622_window.xul
@@ -136,11 +136,11 @@
     }
     
   ]]></script>
 
   <commandset>
     <command id="cmd_find"
      oncommand="document.getElementById('FindToolbar').onFindCommand();"/>
   </commandset>
-  <browser type="content-primary" flex="1" id="content" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content" src="about:blank"/>
   <findbar id="FindToolbar" browserid="content"/>
 </window>

--- a/docshell/test/chrome/bug301397_window.xul
+++ b/docshell/test/chrome/bug301397_window.xul
@@ -239,10 +239,10 @@
       verifyIframeInnerHtml("You made it");
       
       // Tell the framework the test is finished.
       finish();
     }
     
   ]]></script>
 
-  <browser type="content-primary" flex="1" id="content" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content" src="about:blank"/>
 </window>

--- a/docshell/test/chrome/bug303267_window.xul
+++ b/docshell/test/chrome/bug303267_window.xul
@@ -90,10 +90,10 @@
     // Return the innerHTML of a particular element in the content document.
     //
     function getInnerHTMLById(id) {
       return TestWindow.getDocument().getElementById(id).innerHTML;
     }
     
   ]]></script>
 
-  <browser type="content-primary" flex="1" id="content" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content" src="about:blank"/>
 </window>

--- a/docshell/test/chrome/bug311007_window.xul
+++ b/docshell/test/chrome/bug311007_window.xul
@@ -190,10 +190,10 @@ function step4B(aWebProgress, aRequest, 
 
   /* End. */
   aWebProgress.removeProgressListener(gListener);
   delete(gListener);
   finish();
 }
   ]]></script>
 
-  <browser type="content-primary" flex="1" id="content" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content" src="about:blank"/>
 </window>

--- a/docshell/test/chrome/bug321671_window.xul
+++ b/docshell/test/chrome/bug321671_window.xul
@@ -122,10 +122,10 @@
       }
       
       // Tell the framework the test is finished.
       finish();
     }
     
   ]]></script>
 
-  <browser type="content-primary" flex="1" id="content" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content" src="about:blank"/>
 </window>

--- a/docshell/test/chrome/bug360511_window.xul
+++ b/docshell/test/chrome/bug360511_window.xul
@@ -123,10 +123,10 @@
       }
                       
       // Tell the framework the test is finished.
       finish();
     }
     
   ]]></script>
 
-  <browser type="content-primary" flex="1" id="content" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content" src="about:blank"/>
 </window>

--- a/docshell/test/chrome/bug364461_window.xul
+++ b/docshell/test/chrome/bug364461_window.xul
@@ -261,10 +261,10 @@
       
       is(gBrowser.currentURI.spec, "data:text/plain,aaa",
          "Navigation is blocked when clicking link");
 
       finish();
     }
   ]]></script>
 
-  <browser type="content-primary" flex="1" id="content" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content" src="about:blank"/>
 </window>

--- a/docshell/test/chrome/bug396519_window.xul
+++ b/docshell/test/chrome/bug396519_window.xul
@@ -158,10 +158,10 @@
       gExpected = [false, false, true, true, false, false];
       gBrowser.gotoIndex(5);
       yield undefined;
 
       finish();
     }
   ]]></script>
 
-  <browser type="content-primary" flex="1" id="content" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content" src="about:blank"/>
 </window>

--- a/docshell/test/chrome/bug396649_window.xul
+++ b/docshell/test/chrome/bug396649_window.xul
@@ -111,10 +111,10 @@
       }
       
       // Tell the framework the test is finished.
       finish();
     }
     
   ]]></script>
 
-  <browser type="content-primary" flex="1" id="content" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content" src="about:blank"/>
 </window>

--- a/docshell/test/chrome/bug582176_window.xul
+++ b/docshell/test/chrome/bug582176_window.xul
@@ -77,10 +77,10 @@
 
       os.removeObserver(observer, "content-document-global-created")
 
       // Tell the framework the test is finished.
       finish();
     }
     
   ]]></script>
-  <browser type="content-primary" flex="1" id="content" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content" src="about:blank"/>
 </window>

--- a/docshell/test/chrome/bug662200_window.xul
+++ b/docshell/test/chrome/bug662200_window.xul
@@ -118,10 +118,10 @@
       is(shistory.requestedIndex, -1, "Requested index should be cleared!");
 
       // Tell the framework the test is finished.
       finish();
     }
     
   ]]></script>
 
-  <browser type="content-primary" flex="1" id="content" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content" src="about:blank"/>
 </window>

--- a/docshell/test/chrome/bug690056_window.xul
+++ b/docshell/test/chrome/bug690056_window.xul
@@ -165,10 +165,10 @@
       });
       yield undefined;
 
       // Tell the framework the test is finished.
       finish();
     }
   ]]></script>
 
-  <browser type="content-primary" flex="1" id="content" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content" src="about:blank"/>
 </window>

--- a/docshell/test/chrome/bug89419_window.xul
+++ b/docshell/test/chrome/bug89419_window.xul
@@ -71,10 +71,10 @@
       ok(snapshotsEqual(first, third), "going back should be the same as the initial load");
 
       // Tell the framework the test is finished.
       finish();
     }
 
   ]]></script>
 
-  <browser type="content-primary" flex="1" id="content" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content" src="about:blank"/>
 </window>

--- a/docshell/test/chrome/bug92598_window.xul
+++ b/docshell/test/chrome/bug92598_window.xul
@@ -107,10 +107,10 @@
                    {type: "pageshow", title: "test1", persisted: false}];
       gBrowser.goBack();
       yield undefined;
 
       finish();
     }
   ]]></script>
 
-  <browser type="content-primary" flex="1" id="content" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content" src="about:blank"/>
 </window>

--- a/docshell/test/chrome/window.template.txt
+++ b/docshell/test/chrome/window.template.txt
@@ -35,10 +35,10 @@
       // Tell the framework the test is finished.  Include the final 'yield' 
       // statement to prevent a StopIteration exception from being thrown.
       finish();
       yield undefined;
     }
     
   ]]></script>
 
-  <browser type="content-primary" flex="1" id="content" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content" src="about:blank"/>
 </window>

--- a/dom/base/test/chrome/file_bug1209621.xul
+++ b/dom/base/test/chrome/file_bug1209621.xul
@@ -25,53 +25,53 @@ https://bugzilla.mozilla.org/show_bug.cg
 
   function run() {
     var docshell = window.getInterface(Ci.nsIDocShell);
     ok(docshell, "Active window should have a DocShell");
     var treeOwner = docshell.treeOwner;
     ok(treeOwner, "Active docshell should have a TreeOwner!");
 
     is(treeOwner.primaryContentShell, null,
-       "There shouldn't be primaryContentShell because no browser has type=content-primary.");
+       "There shouldn't be primaryContentShell because no browser has primary=true.");
     is(treeOwner.primaryTabParent, null,
-       "There shouldn't be primaryTabParent because no remote browser has type=content-primary.");
+       "There shouldn't be primaryTabParent because no remote browser has primary=true.");
 
     var ip = document.getElementById("inprocess");
     var remote = document.getElementById("remote");
     var remote2 = document.getElementById("remote2");
 
-    ip.setAttribute("type", "content-primary");
+    ip.setAttribute("primary", "true");
     ok(ip.docShell, "non-remote browser should have a DocShell.");
     is(treeOwner.primaryContentShell, ip.docShell,
-       "content-primary browser should be the primaryContentShell.");
+       "primary browser should be the primaryContentShell.");
     is(treeOwner.primaryTabParent, null,
-       "There shouldn't be primaryTabParent because no remote browser has type=content-primary.");
+       "There shouldn't be primaryTabParent because no remote browser has primary=true.");
 
-    ip.setAttribute("type", "content");
-    remote.setAttribute("type", "content-primary");
+    ip.removeAttribute("primary");
+    remote.setAttribute("primary", "true");
     is(treeOwner.primaryContentShell, null,
-       "There shouldn't be primaryContentShell because no browser has type=content-primary.");
+       "There shouldn't be primaryContentShell because no browser has primary=true.");
     var tp = remote.QueryInterface(Ci.nsIFrameLoaderOwner).frameLoader.tabParent;
     ok(tp, "Remote browsers should have a TabParent.");
     is(treeOwner.primaryTabParent, tp,
-       "content-primary remote browser should be the primaryTabParent.");
+       "primary remote browser should be the primaryTabParent.");
 
-    remote.setAttribute("type", "content");
+    remote.removeAttribute("primary");
     is(treeOwner.primaryContentShell, null,
-       "There shouldn't be primaryContentShell because no browser has type=content-primary.");
+       "There shouldn't be primaryContentShell because no browser has primary=true.");
     is(treeOwner.primaryTabParent, null,
-       "There shouldn't be primaryTabParent because no remote browser has type=content-primary.");
+       "There shouldn't be primaryTabParent because no remote browser has primary=true.");
 
-    remote2.setAttribute("type", "content-primary");
+    remote2.setAttribute("primary", "true");
     var tp2 = remote2.QueryInterface(Ci.nsIFrameLoaderOwner).frameLoader.tabParent;
     ok(tp2, "Remote browsers should have a TabParent.");
     is(treeOwner.primaryTabParent, tp2,
-       "content-primary remote browser should be the primaryTabParent.");
+       "primary remote browser should be the primaryTabParent.");
     is(treeOwner.primaryContentShell, null,
-       "There shouldn't be primaryContentShell because no browser has type=content-primary.");
+       "There shouldn't be primaryContentShell because no browser has primary=true.");
 
     opener.setTimeout("done()", 0);
     window.close();
   }
 
   ]]></script>
   <browser type="content" src="about:blank" id="inprocess"/>
   <browser type="content" remote="true" src="about:blank" id="remote"/>

--- a/dom/events/test/window_bug617528.xul
+++ b/dom/events/test/window_bug617528.xul
@@ -1,9 +1,9 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         width="640" height="480">
 
-  <browser id="browser" type="content-primary" flex="1" src="about:blank"
+  <browser id="browser" type="content" primary="true" flex="1" src="about:blank"
            disablehistory="true" disablesecurity="true"/>
 
 </window>

--- a/dom/plugins/test/mochitest/xulbrowser_plugin_visibility.xul
+++ b/dom/plugins/test/mochitest/xulbrowser_plugin_visibility.xul
@@ -5,18 +5,18 @@
 	orient="vertical">
 
   <tabbox id="tabbox" flex="1">
     <tabs>
       <tab id="tab1" label="Tab 1" />
       <tab id="tab2" label="Tab 2" />
     </tabs>
     <tabpanels flex="1">
-      <browser id="browser1" type="content-primary" flex="1" src="about:blank"/>
-      <browser id="browser2" type="content-primary" flex="1" src="about:blank"/>
+      <browser id="browser1" type="content" primary="true" flex="1" src="about:blank"/>
+      <browser id="browser2" type="content" primary="true" flex="1" src="about:blank"/>
     </tabpanels>
   </tabbox>
   <script type="application/javascript" src="plugin-utils.js"/>
   <script type="application/javascript"><![CDATA[
     const ok = window.opener.wrappedJSObject.ok;
     const is = window.opener.wrappedJSObject.is;
     const done = window.opener.wrappedJSObject.done;
     const SimpleTest = window.opener.wrappedJSObject.SimpleTest;

--- a/editor/composer/test/test_bug434998.xul
+++ b/editor/composer/test/test_bug434998.xul
@@ -14,17 +14,18 @@ https://bugzilla.mozilla.org/show_bug.cg
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
 
   <body xmlns="http://www.w3.org/1999/xhtml">
   <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=434998"
      target="_blank">Mozilla Bug 434998</a>
   <p/>
   <editor xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
           id="editor"
-          type="content-primary"
+          type="content"
+          primary="true"
           editortype="html"
           style="width: 400px; height: 100px; border: thin solid black"/>
   <p/>
   <pre id="test">
   </pre>
   </body>
   <script class="testbody" type="application/javascript">
   <![CDATA[

--- a/editor/libeditor/tests/test_bug607584.xul
+++ b/editor/libeditor/tests/test_bug607584.xul
@@ -14,17 +14,18 @@ https://bugzilla.mozilla.org/show_bug.cg
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
 
   <body xmlns="http://www.w3.org/1999/xhtml">
   <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=607584"
      target="_blank">Mozilla Bug 607584</a>
   <p/>
   <editor xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
           id="editor"
-          type="content-primary"
+          type="content"
+          primary="true"
           editortype="html"
           style="width: 400px; height: 100px; border: thin solid black"/>
   <p/>
   <pre id="test">
   </pre>
   </body>
   <script class="testbody" type="application/javascript">
   <![CDATA[

--- a/editor/libeditor/tests/test_bug780908.xul
+++ b/editor/libeditor/tests/test_bug780908.xul
@@ -16,17 +16,18 @@ adapted from test_bug607584.xul by Kent 
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
 
   <body xmlns="http://www.w3.org/1999/xhtml">
   <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=780908"
      target="_blank">Mozilla Bug 780908</a>
   <p/>
   <editor xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
           id="editor"
-          type="content-primary"
+          type="content"
+          primary="true"
           editortype="html"
           style="width: 400px; height: 100px; border: thin solid black"/>
   <p/>
   <pre id="test">
   </pre>
   </body>
   <script class="testbody" type="application/javascript">
   <![CDATA[

--- a/layout/generic/test/file_bug514732_window.xul
+++ b/layout/generic/test/file_bug514732_window.xul
@@ -72,10 +72,10 @@
       // Tell the framework the test is finished.  Include the final 'yield' 
       // statement to prevent a StopIteration exception from being thrown.
       finish();
       yield;
     }
     
   ]]></script>
 
-  <browser type="content-primary" flex="1" id="content" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content" src="about:blank"/>
 </window>

--- a/layout/reftests/bugs/558011-1-ref.xul
+++ b/layout/reftests/bugs/558011-1-ref.xul
@@ -3,12 +3,12 @@
 <window xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <hbox flex="1" style="direction: rtl;">
 <richlistbox style="width: 100px; direction: ltr;">
 <item>this is a really really really really long test sentence</item>
 </richlistbox>
 <splitter/>
-<browser flex="1" src="" type="content-primary"/>
+<browser flex="1" src="" type="content" primary="true"/>
 </hbox>
 
 </window>

--- a/layout/reftests/bugs/558011-1.xul
+++ b/layout/reftests/bugs/558011-1.xul
@@ -3,12 +3,12 @@
 <window xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <hbox flex="1" style="direction: rtl;">
 <richlistbox style="width: 100px; direction: rtl;">
 <item>this is a really really really really long test sentence</item>
 </richlistbox>
 <splitter/>
-<browser flex="1" src="" type="content-primary"/>
+<browser flex="1" src="" type="content" primary="true"/>
 </hbox>
 
 </window>

--- a/layout/tools/reftest/reftest.jsm
+++ b/layout/tools/reftest/reftest.jsm
@@ -309,17 +309,18 @@ this.OnRefTestLoad = function OnRefTestL
     if (gBrowserIsIframe) {
       gBrowser = gContainingWindow.document.createElementNS(XHTML_NS, "iframe");
       gBrowser.setAttribute("mozbrowser", "");
     } else {
       gBrowser = gContainingWindow.document.createElementNS(XUL_NS, "xul:browser");
       gBrowser.setAttribute("class", "lightweight");
     }
     gBrowser.setAttribute("id", "browser");
-    gBrowser.setAttribute("type", "content-primary");
+    gBrowser.setAttribute("type", "content");
+    gBrowser.setAttribute("primary", "true");
     gBrowser.setAttribute("remote", gBrowserIsRemote ? "true" : "false");
     // Make sure the browser element is exactly 800x1000, no matter
     // what size our window is
     gBrowser.setAttribute("style", "padding: 0px; margin: 0px; border:none; min-width: 800px; min-height: 1000px; max-width: 800px; max-height: 1000px");
 
     if (Services.appinfo.OS == "Android") {
       let doc;
       if (Services.appinfo.widgetToolkit == "gonk") {

--- a/toolkit/content/tests/chrome/bug263683_window.xul
+++ b/toolkit/content/tests/chrome/bug263683_window.xul
@@ -223,12 +223,12 @@
         content.document.documentElement.focus();
       });
 
       gFindBar.close(true);
       yield new Promise(resolve => setTimeout(resolve, kIteratorTimeout));
     }
   ]]></script>
 
-  <browser type="content-primary" flex="1" id="content" src="about:blank"/>
-  <browser type="content-primary" flex="1" id="content-remote" remote="true" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content-remote" remote="true" src="about:blank"/>
   <findbar id="FindToolbar" browserid="content"/>
 </window>

--- a/toolkit/content/tests/chrome/bug304188_window.xul
+++ b/toolkit/content/tests/chrome/bug304188_window.xul
@@ -83,12 +83,12 @@ find-menu appears in editor element whic
           event.initKeyEvent("keypress", true, true, null, false, false,
                              false, false, 0, args.charCode);
           content.document.body.dispatchEvent(event);
         });
       }
     }
   ]]></script>
 
-  <browser id="content" flex="1" src="about:blank" type="content-primary"/>
-  <browser id="content-remote" remote="true" flex="1" src="about:blank" type="content-primary"/>
+  <browser id="content" flex="1" src="about:blank" type="content" primary="true"/>
+  <browser id="content-remote" remote="true" flex="1" src="about:blank" type="content" primary="true"/>
   <findbar id="FindToolbar" browserid="content"/>
 </window>

--- a/toolkit/content/tests/chrome/bug331215_window.xul
+++ b/toolkit/content/tests/chrome/bug331215_window.xul
@@ -94,12 +94,12 @@
         yield promise;
       }
     }
   ]]></script>
 
   <commandset>
     <command id="cmd_find" oncommand="document.getElementById('FindToolbar').onFindCommand();"/>
   </commandset>
-  <browser type="content-primary" flex="1" id="content" src="about:blank"/>
-  <browser type="content-primary" flex="1" id="content-remote" remote="true" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content-remote" remote="true" src="about:blank"/>
   <findbar id="FindToolbar" browserid="content"/>
 </window>

--- a/toolkit/content/tests/chrome/bug360437_window.xul
+++ b/toolkit/content/tests/chrome/bug360437_window.xul
@@ -109,12 +109,12 @@
         event.initKeyEvent("keypress", true, true, null, false, false,
                            false, false, 0, str.charCodeAt(i));
         gFindBar._findField.inputField.dispatchEvent(event);
       }
       return promise;
     }
   ]]></script>
   <textbox id="textbox"/>
-  <browser type="content-primary" flex="1" id="content" src="about:blank"/>
-  <browser type="content-primary" flex="1" id="content-remote" remote="true" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content-remote" remote="true" src="about:blank"/>
   <findbar id="FindToolbar" browserid="content"/>
 </window>

--- a/toolkit/content/tests/chrome/bug409624_window.xul
+++ b/toolkit/content/tests/chrome/bug409624_window.xul
@@ -88,11 +88,11 @@
       gFindBar.close();
 
       finish();
     }
 
     SimpleTest.waitForFocus(startTest, window);
   ]]></script>
 
-  <browser type="content-primary" flex="1" id="content" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content" src="about:blank"/>
   <findbar id="FindToolbar" browserid="content"/>
 </window>

--- a/toolkit/content/tests/chrome/bug429723_window.xul
+++ b/toolkit/content/tests/chrome/bug429723_window.xul
@@ -74,11 +74,11 @@
       ok(notRed, "Find Bar textbox is correct colour");
       finish();
     }
   ]]></script>
 
   <commandset>
     <command id="cmd_find" oncommand="document.getElementById('FindToolbar').onFindCommand();"/>
   </commandset>
-  <browser type="content-primary" flex="1" id="content" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content" src="about:blank"/>
   <findbar id="FindToolbar" browserid="content"/>
 </window>

--- a/toolkit/content/tests/chrome/bug451540_window.xul
+++ b/toolkit/content/tests/chrome/bug451540_window.xul
@@ -228,12 +228,12 @@
         window.close();
         SimpleTest.finish();
       });
     }
 
     SimpleTest.waitForFocus(startTest, window);
   ]]></script>
 
-  <browser type="content-primary" flex="1" id="content" src="about:blank"/>
-  <browser type="content-primary" flex="1" id="content-remote" remote="true" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content-remote" remote="true" src="about:blank"/>
   <findbar id="FindToolbar" browserid="content"/>
 </window>

--- a/toolkit/content/tests/chrome/findbar_entireword_window.xul
+++ b/toolkit/content/tests/chrome/findbar_entireword_window.xul
@@ -262,12 +262,12 @@
 
       gFindBar.close();
     }
   ]]></script>
 
   <commandset>
     <command id="cmd_find" oncommand="document.getElementById('FindToolbar').onFindCommand();"/>
   </commandset>
-  <browser type="content-primary" flex="1" id="content" src="about:blank"/>
-  <browser type="content-primary" flex="1" id="content-remote" remote="true" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content-remote" remote="true" src="about:blank"/>
   <findbar id="FindToolbar" browserid="content"/>
 </window>

--- a/toolkit/content/tests/chrome/findbar_events_window.xul
+++ b/toolkit/content/tests/chrome/findbar_events_window.xul
@@ -168,12 +168,12 @@
       yield checkSelection();
 
       // Toggle it back to the original setting.
       if (highlightButton.checked)
         highlightButton.click();
     }
   ]]></script>
 
-  <browser type="content-primary" flex="1" id="content" src="about:blank"/>
-  <browser type="content-primary" flex="1" id="content-remote" remote="true" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content-remote" remote="true" src="about:blank"/>
   <findbar id="FindToolbar" browserid="content"/>
 </window>

--- a/toolkit/content/tests/chrome/findbar_window.xul
+++ b/toolkit/content/tests/chrome/findbar_window.xul
@@ -765,12 +765,12 @@
       check.click();
       gFindBar.close(true);
     }
   ]]></script>
 
   <commandset>
     <command id="cmd_find" oncommand="document.getElementById('FindToolbar').onFindCommand();"/>
   </commandset>
-  <browser type="content-primary" flex="1" id="content" src="about:blank"/>
-  <browser type="content-primary" flex="1" id="content-remote" remote="true" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content" src="about:blank"/>
+  <browser type="content" primary="true" flex="1" id="content-remote" remote="true" src="about:blank"/>
   <findbar id="FindToolbar" browserid="content"/>
 </window>

--- a/toolkit/content/tests/fennec-tile-testapp/chrome/content/BrowserView.js
+++ b/toolkit/content/tests/fennec-tile-testapp/chrome/content/BrowserView.js
@@ -414,17 +414,18 @@ function() {
         this.discardAllBatchOperations();
 
         currentBrowser.setAttribute("type", "content");
         currentBrowser.docShell.isOffScreenBrowser = false;
       }
 
       this._restoreBrowser(browser);
 
-      browser.setAttribute("type", "content-primary");
+      browser.setAttribute("type", "content");
+      browser.setAttribute("primary", "true");
 
       this.beginBatchOperation();
 
       browser.addEventListener("MozAfterPaint", this.handleMozAfterPaint, false);
 
       // !!! --- RESIZE HACK BEGIN -----
       // change to the real event type and perhaps refactor the handler function name
       browser.addEventListener("FakeMozAfterSizeChange", this.handleMozAfterSizeChange, false);

--- a/toolkit/content/tests/fennec-tile-testapp/chrome/content/FooScript.js
+++ b/toolkit/content/tests/fennec-tile-testapp/chrome/content/FooScript.js
@@ -209,17 +209,18 @@ BrowserView.prototype = {
       currentBrowser.mPanY = ws._viewingRect.y;
 
       // stop monitor paint events for this browser
       currentBrowser.removeEventListener("MozAfterPaint", this.handleMozAfterPaint, false);
       currentBrowser.setAttribute("type", "content");
       currentBrowser.docShell.isOffScreenBrowser = false;
     }
 
-    browser.setAttribute("type", "content-primary");
+    browser.setAttribute("type", "content");
+    browser.setAttribute("primary", "true");
     if (!skipZoom)
       browser.docShell.isOffScreenBrowser = true;
 
     // start monitoring paint events for this browser
     browser.addEventListener("MozAfterPaint", this.handleMozAfterPaint, false);
 
     this._browser = browser;