Revert r14620 which was a rollback of r14549 and r14508. This

chrome/chrome.gyp

 # Copyright (c) 2009 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     '../build/common.gypi',
@@ skipping 2131 matching lines @@
           'sources!': [
             # TODO(port)
             'app/chrome_main_uitest.cc',
             'browser/crash_recovery_uitest.cc',
             # blocked on download shelf
             'browser/download/save_page_uitest.cc',
             'browser/login_prompt_uitest.cc',
             'browser/metrics/metrics_service_uitest.cc',
             'browser/sessions/session_restore_uitest.cc',
             'browser/tab_restore_uitest.cc',
+            'browser/unload_uitest.cc',
             'test/reliability/page_load_test.cc',
             'test/ui/layout_plugin_uitest.cc',
             'test/ui/omnibox_uitest.cc',
              # these pass locally but fail on the bots
             'common/net/cache_uitest.cc',
           ],
         }],
         ['OS=="win"', {
           'include_dirs': [
             'third_party/wtl/include',
           ],
           'dependencies': [
             '../google_update/google_update.gyp:google_update',
             'views',
           ],
           'link_settings': {
             'libraries': [
               '-lOleAcc.lib',
             ],
           },
         }, { # else: OS != "win"
           'sources!': [
             # TODO(port)?  (Most of these include windows.h or similar.)
             'browser/printing/printing_layout_uitest.cc',
             'browser/ssl/ssl_uitest.cc',
-            'browser/unload_uitest.cc',
             'browser/views/find_bar_win_uitest.cc',
             'common/logging_chrome_uitest.cc',
             'test/accessibility/accessibility_tests.cc',
             'test/accessibility/accessibility_util.cc',
             'test/accessibility/browser_impl.cc',
             'test/accessibility/keyboard_util.cc',
             'test/accessibility/registry_util.cc',
             'test/accessibility/tab_impl.cc',
             'test/automation/automation_proxy_uitest.cc',
             'test/perf/mem_usage.cc',
@@ skipping 807 matching lines @@
                           '../tools/code_coverage/coverage_posix.py',
                           '--directory',
                           '<(PRODUCT_DIR)' ],
             },
           ],  # 'actions'
         },
       ]
     }],
   ],  # 'conditions'
 }