diff options
| author | scr@chromium.org <scr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-11 19:48:32 +0000 |
|---|---|---|
| committer | scr@chromium.org <scr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-11 19:48:32 +0000 |
| commit | 10d7c0e4a5e5e15c0574b9ac4a94a93605c733bd (patch) | |
| tree | 70881eedcf6112d819456e92e02e884a9238476f /chrome/chrome_tests.gypi | |
| parent | 06230fad86a6eb8845d615ec3fbeb030406574b0 (diff) | |
| download | chromium_src-10d7c0e4a5e5e15c0574b9ac4a94a93605c733bd.zip chromium_src-10d7c0e4a5e5e15c0574b9ac4a94a93605c733bd.tar.gz chromium_src-10d7c0e4a5e5e15c0574b9ac4a94a93605c733bd.tar.bz2 | |
WebUI test framework: fix Mock4JS verification, allow chrome.send passthrough.
1) Add test for Bug 99970 Comment 6 & fix
2) Allow chrome.send to be mocked outside of preLoad call.
3) add chrome.originalSend to allow mocked messages to pass through to C++.
Also to address need for .cc file to be correct for clang, and prevent ugliness in js with a lot of GEN lines, allow the header and .cc to not have a suffix, and the generated file to end in -gen.cc. While doing this, addressed crbug.com/102794 to put in <(INTERMEDIATE_DIR) preventing collisions across rules.
R=flackr@chromium.org,wyck@chromium.org
BUG=103740,99970,102794
TEST=browser_tests --gtest_filter=Mock4JS*.* AND ChromeSend*.*
Review URL: http://codereview.chromium.org/8515016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109678 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
| -rw-r--r-- | chrome/chrome_tests.gypi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 401c64c..c4f7616 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -2670,6 +2670,9 @@ 'test/data/webui/async_gen.js', 'test/data/webui/certificate_viewer_dialog_test.js', 'test/data/webui/certificate_viewer_ui_test-inl.h', + 'test/data/webui/chrome_send_browsertest-inl.h', + 'test/data/webui/chrome_send_browsertest.js', + 'test/data/webui/mock4js_browsertest.js', 'test/data/webui/ntp4.js', 'test/data/webui/print_preview.js', # TODO(craig): Rename this and run from base_unittests when the test |