summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorbattre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-26 16:15:31 +0000
committerbattre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-26 16:15:31 +0000
commit155ce4a7d8f0e251781e85caadb7122549e5c60a (patch)
treee7219c89bbac0f1e333f180cc84218a099a86d88 /chrome_frame
parent78af0dd99c374b0bd812bf0c9bdb1a8175510f90 (diff)
downloadchromium_src-155ce4a7d8f0e251781e85caadb7122549e5c60a.zip
chromium_src-155ce4a7d8f0e251781e85caadb7122549e5c60a.tar.gz
chromium_src-155ce4a7d8f0e251781e85caadb7122549e5c60a.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98424 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/navigation_test.cc4
-rw-r--r--chrome_frame/test/ready_mode_unittest.cc4
2 files changed, 2 insertions, 6 deletions
diff --git a/chrome_frame/test/navigation_test.cc b/chrome_frame/test/navigation_test.cc
index 90a544c..d6e750f 100644
--- a/chrome_frame/test/navigation_test.cc
+++ b/chrome_frame/test/navigation_test.cc
@@ -1051,9 +1051,7 @@ 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.
-// This test has been disabled due to bug
-// http://code.google.com/p/chromium/issues/detail?id=94362
-TEST_F(FullTabDownloadTest, DISABLED_TopLevelPostReissueFromChromeFramePage) {
+TEST_F(FullTabDownloadTest, 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 f8c5b8e..6022d26 100644
--- a/chrome_frame/test/ready_mode_unittest.cc
+++ b/chrome_frame/test/ready_mode_unittest.cc
@@ -219,9 +219,7 @@ class ReadyPromptWindowButtonTest : public ReadyPromptWindowTest {
chrome_frame_test::TimedMsgLoop message_loop_;
}; // class ReadyPromptWindowButtonTest
-// This test has been disabled due to bug
-// http://code.google.com/p/chromium/issues/detail?id=94362
-TEST_F(ReadyPromptTest, DISABLED_ReadyPromptContentTest) {
+TEST_F(ReadyPromptTest, ReadyPromptContentTest) {
// owned by ReadyPromptContent
MockReadyModeState* state = new MockReadyModeState();
MockUrlLauncher* url_launcher = new MockUrlLauncher();