--- a/layout/style/test/test_media_queries.html
+++ b/layout/style/test/test_media_queries.html
@@ -642,48 +642,60 @@ function run() {
   expression_should_not_be_parseable("-moz-windows-default-theme");
   expression_should_not_be_parseable("-moz-mac-graphite-theme");
   expression_should_not_be_parseable("-moz-mac-yosemite-theme");
   expression_should_not_be_parseable("-moz-windows-accent-color-in-titlebar");
   expression_should_not_be_parseable("-moz-windows-compositor");
   expression_should_not_be_parseable("-moz-windows-classic");
   expression_should_not_be_parseable("-moz-windows-glass");
   expression_should_not_be_parseable("-moz-swipe-animation-enabled");
+  expression_should_not_be_parseable("-moz-gtk-csd-available");
+  expression_should_not_be_parseable("-moz-gtk-csd-minimize-button");
+  expression_should_not_be_parseable("-moz-gtk-csd-maximize-button");
+  expression_should_not_be_parseable("-moz-gtk-csd-close-button");
   expression_should_be_parseable("-moz-touch-enabled");
 
   expression_should_not_be_parseable("-moz-scrollbar-start-backward: 0");
   expression_should_not_be_parseable("-moz-scrollbar-start-forward: 0");
   expression_should_not_be_parseable("-moz-scrollbar-end-backward: 0");
   expression_should_not_be_parseable("-moz-scrollbar-end-forward: 0");
   expression_should_not_be_parseable("-moz-scrollbar-thumb-proportional: 0");
   expression_should_not_be_parseable("-moz-overlay-scrollbars: 0");
   expression_should_not_be_parseable("-moz-windows-default-theme: 0");
   expression_should_not_be_parseable("-moz-mac-graphite-theme: 0");
   expression_should_not_be_parseable("-moz-mac-yosemite-theme: 0");
   expression_should_not_be_parseable("-moz-windows-accent-color-in-titlebar: 0");
   expression_should_not_be_parseable("-moz-windows-compositor: 0");
   expression_should_not_be_parseable("-moz-windows-classic: 0");
   expression_should_not_be_parseable("-moz-windows-glass: 0");
   expression_should_not_be_parseable("-moz-swipe-animation-enabled: 0");
+  expression_should_not_be_parseable("-moz-gtk-csd-available: 0");
+  expression_should_not_be_parseable("-moz-gtk-csd-minimize-button: 0");
+  expression_should_not_be_parseable("-moz-gtk-csd-maximize-button: 0");
+  expression_should_not_be_parseable("-moz-gtk-csd-close-button: 0");
   expression_should_be_parseable("-moz-touch-enabled: 0");
 
   expression_should_not_be_parseable("-moz-scrollbar-start-backward: 1");
   expression_should_not_be_parseable("-moz-scrollbar-start-forward: 1");
   expression_should_not_be_parseable("-moz-scrollbar-end-backward: 1");
   expression_should_not_be_parseable("-moz-scrollbar-end-forward: 1");
   expression_should_not_be_parseable("-moz-scrollbar-thumb-proportional: 1");
   expression_should_not_be_parseable("-moz-overlay-scrollbars: 1");
   expression_should_not_be_parseable("-moz-windows-default-theme: 1");
   expression_should_not_be_parseable("-moz-mac-graphite-theme: 1");
   expression_should_not_be_parseable("-moz-mac-yosemite-theme: 1");
   expression_should_not_be_parseable("-moz-windows-accent-color-in-titlebar: 1");
   expression_should_not_be_parseable("-moz-windows-compositor: 1");
   expression_should_not_be_parseable("-moz-windows-classic: 1");
   expression_should_not_be_parseable("-moz-windows-glass: 1");
   expression_should_not_be_parseable("-moz-swipe-animation-enabled: 1");
+  expression_should_not_be_parseable("-moz-gtk-csd-available: 1");
+  expression_should_not_be_parseable("-moz-gtk-csd-minimize-button: 1");
+  expression_should_not_be_parseable("-moz-gtk-csd-maximize-button: 1");
+  expression_should_not_be_parseable("-moz-gtk-csd-close-button: 1");
   expression_should_be_parseable("-moz-touch-enabled: 1");
 
   expression_should_not_be_parseable("-moz-scrollbar-start-backward: -1");
   expression_should_not_be_parseable("-moz-scrollbar-start-forward: -1");
   expression_should_not_be_parseable("-moz-scrollbar-end-backward: -1");
   expression_should_not_be_parseable("-moz-scrollbar-end-forward: -1");
   expression_should_not_be_parseable("-moz-scrollbar-thumb-proportional: -1");
   expression_should_not_be_parseable("-moz-overlay-scrollbars: -1");
@@ -691,32 +703,40 @@ function run() {
   expression_should_not_be_parseable("-moz-mac-graphite-theme: -1");
   expression_should_not_be_parseable("-moz-mac-yosemite-theme: -1");
   expression_should_not_be_parseable("-moz-windows-accent-color-in-titlebar: -1");
   expression_should_not_be_parseable("-moz-windows-compositor: -1");
   expression_should_not_be_parseable("-moz-windows-classic: -1");
   expression_should_not_be_parseable("-moz-windows-glass: -1");
   expression_should_not_be_parseable("-moz-touch-enabled: -1");
   expression_should_not_be_parseable("-moz-swipe-animation-enabled: -1");
+  expression_should_not_be_parseable("-moz-gtk-csd-available: -1");
+  expression_should_not_be_parseable("-moz-gtk-csd-minimize-button: -1");
+  expression_should_not_be_parseable("-moz-gtk-csd-maximize-button: -1");
+  expression_should_not_be_parseable("-moz-gtk-csd-close-button: -1");
 
   expression_should_not_be_parseable("-moz-scrollbar-start-backward: true");
   expression_should_not_be_parseable("-moz-scrollbar-start-forward: true");
   expression_should_not_be_parseable("-moz-scrollbar-end-backward: true");
   expression_should_not_be_parseable("-moz-scrollbar-end-forward: true");
   expression_should_not_be_parseable("-moz-scrollbar-thumb-proportional: true");
   expression_should_not_be_parseable("-moz-overlay-scrollbars: true");
   expression_should_not_be_parseable("-moz-windows-default-theme: true");
   expression_should_not_be_parseable("-moz-mac-graphite-theme: true");
   expression_should_not_be_parseable("-moz-mac-yosemite-theme: true");
   expression_should_not_be_parseable("-moz-windows-accent-color-in-titlebar: true");
   expression_should_not_be_parseable("-moz-windows-compositor: true");
   expression_should_not_be_parseable("-moz-windows-classic: true");
   expression_should_not_be_parseable("-moz-windows-glass: true");
   expression_should_not_be_parseable("-moz-touch-enabled: true");
   expression_should_not_be_parseable("-moz-swipe-animation-enabled: true");
+  expression_should_not_be_parseable("-moz-gtk-csd-available: true");
+  expression_should_not_be_parseable("-moz-gtk-csd-minimize-button: true");
+  expression_should_not_be_parseable("-moz-gtk-csd-maximize-button: true");
+  expression_should_not_be_parseable("-moz-gtk-csd-close-button: true");
 
   // windows theme media queries
   expression_should_not_be_parseable("-moz-windows-theme: aero");
   expression_should_not_be_parseable("-moz-windows-theme: aero-lite");
   expression_should_not_be_parseable("-moz-windows-theme: luna-blue");
   expression_should_not_be_parseable("-moz-windows-theme: luna-olive");
   expression_should_not_be_parseable("-moz-windows-theme: luna-silver");
   expression_should_not_be_parseable("-moz-windows-theme: royale");