Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7559)

Unified Diff: chrome/chrome.gyp

Issue 165353: Merge 21668 - Make AutomationProxyTest.NavigateToURLWithTimeout* tests notfla... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Created 11 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp (revision 23129)
+++ chrome/chrome.gyp (working copy)
@@ -635,6 +635,8 @@
'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',
Property changes on: chrome\chrome.gyp
___________________________________________________________________
Modified: svn:mergeinfo
Merged /trunk/src/chrome/chrome.gyp:r21668
« no previous file with comments | « chrome/browser/automation/url_request_slow_http_job.cc ('k') | chrome/test/automation/automation_proxy_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698