Merge 21668 - Make AutomationProxyTest.NavigateToURLWithTimeout* tests notfla...

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,
     # Define the common dependencies that contain all the actual
     # Chromium functionality.  This list gets pulled in below by
     # the link of the actual chrome (or chromium) executable on
@@ skipping 617 matching lines @@
         'browser/automation/ui_controls.cc',
         'browser/automation/ui_controls.h',
         'browser/automation/url_request_failed_dns_job.cc',
         'browser/automation/url_request_failed_dns_job.h',
         # TODO:  These should be moved to test_support (see below), but
         # are currently used by production code in automation_provider.cc.
         'browser/automation/url_request_mock_http_job.cc',
         'browser/automation/url_request_mock_http_job.h',
         'browser/automation/url_request_slow_download_job.cc',
         'browser/automation/url_request_slow_download_job.h',
+        'browser/automation/url_request_slow_http_job.cc',
+        'browser/automation/url_request_slow_http_job.h',
         'browser/back_forward_menu_model.cc',
         'browser/back_forward_menu_model.h',
         'browser/back_forward_menu_model_views.cc',
         'browser/back_forward_menu_model_views.h',
         'browser/blocked_popup_container.cc',
         'browser/blocked_popup_container.h',
         'browser/bookmarks/bookmark_codec.cc',
         'browser/bookmarks/bookmark_codec.h',
         'browser/bookmarks/bookmark_context_menu_controller.cc',
         'browser/bookmarks/bookmark_context_menu_controller.h',
@@ skipping 4408 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],
   ],  # 'conditions'
 }