diff options
author | kevers@chromium.org <kevers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-27 15:07:37 +0000 |
---|---|---|
committer | kevers@chromium.org <kevers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-27 15:07:37 +0000 |
commit | 75d488fd44ddebabbd292cdd013f2b5a012a8b47 (patch) | |
tree | ed1bdf8111071d9c4b05d9df547592e519c244ec /chrome/chrome.gyp | |
parent | a3a7d5222bcb1fdc7a886206701f273a85769895 (diff) | |
download | chromium_src-75d488fd44ddebabbd292cdd013f2b5a012a8b47.zip chromium_src-75d488fd44ddebabbd292cdd013f2b5a012a8b47.tar.gz chromium_src-75d488fd44ddebabbd292cdd013f2b5a012a8b47.tar.bz2 |
Revert 134269 - Revert 134234 - Turn thread restrictions on for release builds as well so that they're triggered in (default) try/commit jobs. I let them be compiled out only in official builds.
Revert breaks ChromeOS Builder (dbg)
Also update bug for net::FileStream usage.
Review URL: https://chromiumcodereview.appspot.com/10238009
TBR=jam@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10256003
TBR=kevers@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10255004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134270 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
-rw-r--r-- | chrome/chrome.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index dac2e3a..1655600 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -856,6 +856,8 @@ 'type': 'none', 'dependencies': [ '../base/base.gyp:base_unittests', + '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', + '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', '../content/content.gyp:content_browsertests', '../content/content.gyp:content_shell', '../content/content.gyp:content_unittests', |