Re-enables CFInstance RPC tests for Firefox that were previously timing out due to insufficient windows for allowing plugin startup. We now assume that startup/loading will succeed in 5 seconds (reasonable for a debug build or slow bots) and that we should wait no longer than 1 seconds to send the ack messages. This puts us well inside the 10s initialization window of CFInstall.js, upped from a previous 1s window in:

	http://codereview.chromium.org/464077

BUG=24100
TEST=chrome_frame_tests.exe --gtest_filter=*WidgetModeFF_CFInstanceRPCInternal*

Review URL: http://codereview.chromium.org/551199

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37550 0039d316-1c4b-4281-b951-d872f2087c98

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");