summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-06 16:48:06 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-06 16:48:06 +0000
commit74bad4b4c067b980ceb9d5b80c82ef67cc55826d (patch)
tree9cfc1d548ac07103615e3061bbc11dc6736e2b86 /chrome/test/ui
parentce5c4504531cfd32972dfd123f98183c3706951a (diff)
downloadchromium_src-74bad4b4c067b980ceb9d5b80c82ef67cc55826d.zip
chromium_src-74bad4b4c067b980ceb9d5b80c82ef67cc55826d.tar.gz
chromium_src-74bad4b4c067b980ceb9d5b80c82ef67cc55826d.tar.bz2
Adding a test for a testing that the bug http://crbug.com/9791 is really fixed.
Removing the interstitial UI tests: they test the same functionalities as the unit-tests but are flacky and most of them have been disabled (a new unit-test for the "show interstitial and then navigate back" has been added to cover for a case that the unit-tests were not covering). TEST=Run the unit-tests. BUG=6729,3327 Review URL: http://codereview.chromium.org/109038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15416 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui')
-rw-r--r--chrome/test/ui/ui_tests.vcproj48
1 files changed, 20 insertions, 28 deletions
diff --git a/chrome/test/ui/ui_tests.vcproj b/chrome/test/ui/ui_tests.vcproj
index ea13ea6..b72989e 100644
--- a/chrome/test/ui/ui_tests.vcproj
+++ b/chrome/test/ui/ui_tests.vcproj
@@ -146,55 +146,55 @@
Name="Common"
>
<File
- RelativePath=".\npapi_test_helper.cc"
+ RelativePath="..\chrome_process_util.cc"
>
</File>
<File
- RelativePath=".\npapi_test_helper.h"
+ RelativePath="..\chrome_process_util.h"
>
</File>
<File
- RelativePath="..\..\tools\build\win\precompiled_wtl.cc"
+ RelativePath="..\chrome_process_util_win.cc"
>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="1"
- />
- </FileConfiguration>
</File>
<File
- RelativePath="..\..\tools\build\win\precompiled_wtl.h"
+ RelativePath=".\javascript_test_util.cc"
>
</File>
<File
- RelativePath=".\run_all_unittests.cc"
+ RelativePath=".\javascript_test_util.h"
>
</File>
<File
- RelativePath="..\chrome_process_util.cc"
+ RelativePath=".\npapi_test_helper.cc"
>
</File>
<File
- RelativePath="..\chrome_process_util.h"
+ RelativePath=".\npapi_test_helper.h"
>
</File>
<File
- RelativePath="..\chrome_process_util_win.cc"
+ RelativePath="..\..\tools\build\win\precompiled_wtl.cc"
>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
</File>
<File
- RelativePath="..\testing_browser_process.h"
+ RelativePath="..\..\tools\build\win\precompiled_wtl.h"
>
</File>
<File
- RelativePath=".\javascript_test_util.cc"
+ RelativePath=".\run_all_unittests.cc"
>
</File>
<File
- RelativePath=".\javascript_test_util.h"
+ RelativePath="..\testing_browser_process.h"
>
</File>
<File
@@ -418,7 +418,7 @@
Name="TestAutomatedUI"
>
<File
- RelativePath="..\automated_ui_tests\automated_ui_test_base.cc"
+ RelativePath="..\automated_ui_tests\automated_ui_test_base.cc"
>
</File>
<File
@@ -463,14 +463,6 @@
</File>
</Filter>
<Filter
- Name="TestInterstitialPage"
- >
- <File
- RelativePath="..\..\browser\interstitial_page_uitest.cc"
- >
- </File>
- </Filter>
- <Filter
Name="TestSSL"
>
<File