diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-12-11 21:33:03 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-12-13 12:34:07 +0100 |
| commit | f2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch) | |
| tree | 0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/chrome_frame | |
| parent | 5362912cdb5eea702b68ebe23702468d17c3017a (diff) | |
| download | qtwebengine-chromium-f2a33ff9cbc6d19943f1c7fbddd1f23d23975577.tar.gz | |
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/chrome_frame')
| -rw-r--r-- | chromium/chrome_frame/chrome_frame.gyp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chromium/chrome_frame/chrome_frame.gyp b/chromium/chrome_frame/chrome_frame.gyp index b495cc0553b..d401ce2e352 100644 --- a/chromium/chrome_frame/chrome_frame.gyp +++ b/chromium/chrome_frame/chrome_frame.gyp @@ -335,6 +335,7 @@ '../chrome/chrome.gyp:test_support_common', '../chrome/chrome.gyp:test_support_ui', '../chrome/chrome.gyp:utility', + '../chrome/test/perf/perf_test.gyp:*', '../content/content.gyp:content_gpu', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', @@ -350,7 +351,7 @@ ], 'sources': [ '../base/test/perf_test_suite.h', - '../base/perftimer.cc', + '../base/test/perftimer.cc', '../base/test/test_file_util.h', '../chrome/test/base/chrome_process_util.cc', '../chrome/test/base/chrome_process_util.h', @@ -412,7 +413,7 @@ '../chrome/chrome.gyp:renderer', '../chrome/chrome.gyp:test_support_common', '../chrome/chrome_resources.gyp:chrome_resources', - '../content/content.gyp:content_app_browser', + '../content/content.gyp:content_app_both', '../content/content.gyp:content_gpu', '../content/content.gyp:test_support_content', '../net/net.gyp:net', |