Merge 46738 - Change to a simpler upgrade scheme for Chrome Frame whereby we ...

chrome_frame/chrome_frame.gyp

 # Copyright (c) 2010 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,
     'xul_sdk_dir': '../third_party/xulrunner-sdk/<(OS)',
 
     'variables': {
@@ skipping 203 matching lines @@
         'bind_context_info.cc',
         'bind_context_info.h',
         'test/automation_client_mock.cc',
         'test/automation_client_mock.h',
         'test/chrome_frame_test_utils.cc',
         'test/chrome_frame_test_utils.h',
         'test/chrome_frame_automation_mock.cc',
         'test/chrome_frame_automation_mock.h',
         'test/http_server.cc',
         'test/http_server.h',
-        'test/module_utils_unittest.cc',
         'test/proxy_factory_mock.cc',
         'test/proxy_factory_mock.h',
         'test/run_all_unittests.cc',
         'test/simulate_input.cc',
         'test/simulate_input.h',
         'test/test_mock_with_web_server.cc',
         'test/test_mock_with_web_server.h',
         'test/test_server.cc',
         'test/test_server.h',
         'test/test_server_test.cc',
@@ skipping 619 matching lines @@
   ],
 }
 
 # vim: shiftwidth=2:et:ai:tabstop=2
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: