summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/chrome_frame_unittests.cc4
-rw-r--r--chrome_frame/test/data/CFInstance_rpc_internal_frame.html2
2 files changed, 2 insertions, 4 deletions
diff --git a/chrome_frame/test/chrome_frame_unittests.cc b/chrome_frame/test/chrome_frame_unittests.cc
index 4d9b6c7..6e9cf27 100644
--- a/chrome_frame/test/chrome_frame_unittests.cc
+++ b/chrome_frame/test/chrome_frame_unittests.cc
@@ -523,9 +523,7 @@ TEST_F(ChromeFrameTestWithWebServer, WidgetModeIE_CFInstanceRPCInternal) {
SimpleBrowserTest(IE, kCFIRPCInternalPage, L"CFInstanceRPCInternal");
}
-// Disabled: http://b/issue?id=2050201
-TEST_F(ChromeFrameTestWithWebServer,
- DISABLED_WidgetModeFF_CFInstanceRPCInternal) {
+TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_CFInstanceRPCInternal) {
SimpleBrowserTest(FIREFOX, kCFIRPCInternalPage, L"CFInstanceRPCInternal");
}
diff --git a/chrome_frame/test/data/CFInstance_rpc_internal_frame.html b/chrome_frame/test/data/CFInstance_rpc_internal_frame.html
index 8208269..1a278c1 100644
--- a/chrome_frame/test/data/CFInstance_rpc_internal_frame.html
+++ b/chrome_frame/test/data/CFInstance_rpc_internal_frame.html
@@ -8,7 +8,7 @@
<script type="text/javascript"
src="CFInstance.js"></script>
<script>
- setTimeout(rpcCall, 10000);
+ setTimeout(rpcCall, 1000);
function rpcCall() {
var cf = CFInstance;
cf.rpc.callRemote("callback");