diff options
| author | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-26 16:36:18 +0000 |
|---|---|---|
| committer | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-26 16:36:18 +0000 |
| commit | 2eeafe8e58a32fc867e2eedb32437820c0545c71 (patch) | |
| tree | 951d7f6671623680d7b246c6cba0bb39eef5670c /chrome_frame/test | |
| parent | 3dcdd99a2adabb9fbbb8dca0abd3675e99c8ca3d (diff) | |
| download | chromium_src-2eeafe8e58a32fc867e2eedb32437820c0545c71.zip chromium_src-2eeafe8e58a32fc867e2eedb32437820c0545c71.tar.gz chromium_src-2eeafe8e58a32fc867e2eedb32437820c0545c71.tar.bz2 | |
Revert 98424 - Revert 98398 - Disabling the ReadyPromptContentTest and the
TopLevelPostReissueFromChromeFramePage
tests as these tests rely on resource dlls being present in the locales folder.
After revision 98103 it looks like chrome uses resource packs internally.
We need to fix ChromeFrame to not use resource dlls and use the packs instead.
BUG=94362
Review URL: http://codereview.chromium.org/7740045
TBR=ananta@chromium.org
Review URL: http://codereview.chromium.org/7745050
TBR=battre@chromium.org
Review URL: http://codereview.chromium.org/7753037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98428 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test')
| -rw-r--r-- | chrome_frame/test/navigation_test.cc | 4 | ||||
| -rw-r--r-- | chrome_frame/test/ready_mode_unittest.cc | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/chrome_frame/test/navigation_test.cc b/chrome_frame/test/navigation_test.cc index d6e750f..90a544c 100644 --- a/chrome_frame/test/navigation_test.cc +++ b/chrome_frame/test/navigation_test.cc @@ -1051,7 +1051,9 @@ TEST_F(FullTabSeleniumTest, Core) { // This should bring up a confirmation dialog which we hit yes on. This should // reissue the top level post request in response to which the html content // containing the meta tag is sent again. -TEST_F(FullTabDownloadTest, TopLevelPostReissueFromChromeFramePage) { +// This test has been disabled due to bug +// http://code.google.com/p/chromium/issues/detail?id=94362 +TEST_F(FullTabDownloadTest, DISABLED_TopLevelPostReissueFromChromeFramePage) { chrome_frame_test::MockWindowObserver post_reissue_watcher; post_reissue_watcher.WatchWindow("Confirm Form Resubmission", ""); diff --git a/chrome_frame/test/ready_mode_unittest.cc b/chrome_frame/test/ready_mode_unittest.cc index 6022d26..f8c5b8e 100644 --- a/chrome_frame/test/ready_mode_unittest.cc +++ b/chrome_frame/test/ready_mode_unittest.cc @@ -219,7 +219,9 @@ class ReadyPromptWindowButtonTest : public ReadyPromptWindowTest { chrome_frame_test::TimedMsgLoop message_loop_; }; // class ReadyPromptWindowButtonTest -TEST_F(ReadyPromptTest, ReadyPromptContentTest) { +// This test has been disabled due to bug +// http://code.google.com/p/chromium/issues/detail?id=94362 +TEST_F(ReadyPromptTest, DISABLED_ReadyPromptContentTest) { // owned by ReadyPromptContent MockReadyModeState* state = new MockReadyModeState(); MockUrlLauncher* url_launcher = new MockUrlLauncher(); |