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

chrome/chrome_tests_unit.gypi

 # Copyright 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'targets': [
     {
       # This target contains mocks and test utilities that don't belong in
       # production libraries but are used by more than one test executable.
       'target_name': 'test_support_common',
       'type': 'static_library',
@@ skipping 2144 matching lines @@
             'browser/ui/app_list/search/tokenized_string_unittest.cc',
           ],
           'dependencies': [
             '../ash/ash.gyp:ash_resources',
             '../ash/ash.gyp:ash_test_support',
             '../ash/ash_strings.gyp:ash_strings',
           ],
           # We eventually want to compile both in Win Aura builds, see
           # http://crbug.com/155545.
           'conditions': [
-            ['OS=="win"', {
-              'sources!': [
-                'browser/ui/window_sizer/window_sizer_ash_unittest.cc',
-              ],
-            }, { # else: OS!=win
+            ['OS !="win"', {
               'sources!': [
                 'browser/ui/window_sizer/window_sizer_unittest.cc',
               ],
             }],
           ],
         }],
         ['use_aura==1', {
           'dependencies': [
             '../ui/aura/aura.gyp:aura_test_support',
           ],
@@ skipping 731 matching lines @@
             'browser/ui/app_list/test/fake_profile.h',
             'browser/ui/app_list/test/fake_profile_store.cc',
             'browser/ui/app_list/test/fake_profile_store.h',
             'browser/ui/app_list/test/fast_show_pickler_unittest.cc',
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }