Merge 236134 "Ensure that the first browser window which is crea..."

chrome/chrome_tests_unit.gypi

Index: chrome/chrome_tests_unit.gypi
===================================================================
--- chrome/chrome_tests_unit.gypi	(revision 239045)
+++ chrome/chrome_tests_unit.gypi	(working copy)
@@ -2162,12 +2162,8 @@
           # We eventually want to compile both in Win Aura builds, see
           # http://crbug.com/155545.
           'conditions': [
-            ['OS=="win"', {
+            ['OS !="win"', {
               'sources!': [
-                'browser/ui/window_sizer/window_sizer_ash_unittest.cc',
-              ],
-            }, { # else: OS!=win
-              'sources!': [
                 'browser/ui/window_sizer/window_sizer_unittest.cc',
               ],
             }],