From d367b4a32a7255ac28e4c59b4586c55f8b909458 Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@mozilla.com>
Date: Wed, 5 Feb 2014 10:57:57 -0800
Subject: [PATCH] Bug 968108 - Enable Metro for Beta and Release [r=bhearsum]

---
 browser/config/mozconfigs/whitelist        | 2 --
 browser/config/mozconfigs/win32/common-opt | 1 +
 browser/config/mozconfigs/win32/nightly    | 1 -
 browser/config/mozconfigs/win64/common-opt | 1 +
 browser/config/mozconfigs/win64/nightly    | 1 -
 5 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/browser/config/mozconfigs/whitelist b/browser/config/mozconfigs/whitelist
index 6e7ccdd088e..025145f00b0 100644
--- a/browser/config/mozconfigs/whitelist
+++ b/browser/config/mozconfigs/whitelist
@@ -60,11 +60,9 @@ whitelist['nightly']['win32'] += [
     'if test "$IS_NIGHTLY" != ""; then',
     'ac_add_options --disable-auto-deps',
     'fi',
-    'ac_add_options --enable-metro',
 ]
 whitelist['nightly']['win64'] += [
     '. "$topsrcdir/browser/config/mozconfigs/win64/common-win64"',
-    'ac_add_options --enable-metro',
 ]
 
 for platform in all_platforms:
diff --git a/browser/config/mozconfigs/win32/common-opt b/browser/config/mozconfigs/win32/common-opt
index 94c5fcf92a2..b2b95dcf33a 100644
--- a/browser/config/mozconfigs/win32/common-opt
+++ b/browser/config/mozconfigs/win32/common-opt
@@ -5,6 +5,7 @@
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc
+ac_add_options --enable-metro
 if [ -f /c/builds/gapi.data ]; then
   _gapi_keyfile=/c/builds/gapi.data
 else
diff --git a/browser/config/mozconfigs/win32/nightly b/browser/config/mozconfigs/win32/nightly
index dd0068dbd0c..b34d458dcf3 100644
--- a/browser/config/mozconfigs/win32/nightly
+++ b/browser/config/mozconfigs/win32/nightly
@@ -2,7 +2,6 @@
 
 ac_add_options --enable-signmar
 ac_add_options --enable-profiling
-ac_add_options --enable-metro
 
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
diff --git a/browser/config/mozconfigs/win64/common-opt b/browser/config/mozconfigs/win64/common-opt
index 9afb969c3e5..04fb96a59fd 100644
--- a/browser/config/mozconfigs/win64/common-opt
+++ b/browser/config/mozconfigs/win64/common-opt
@@ -5,6 +5,7 @@
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc
+ac_add_options --enable-metro
 if [ -f /c/builds/gapi.data ]; then
   _gapi_keyfile=/c/builds/gapi.data
 else
diff --git a/browser/config/mozconfigs/win64/nightly b/browser/config/mozconfigs/win64/nightly
index 1fd63d92f2d..f6bb92bb70d 100644
--- a/browser/config/mozconfigs/win64/nightly
+++ b/browser/config/mozconfigs/win64/nightly
@@ -3,7 +3,6 @@
 
 ac_add_options --enable-signmar
 ac_add_options --enable-profiling
-ac_add_options --enable-metro
 
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics