Reenable the ChromeFrame ContextMenuTest.CFSaveLinkAs test. Increased the timeout for the file sa...

chrome_frame/test/ui_test.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <mshtmcid.h>
 #include <string>
 
 #include "base/test/test_file_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_bstr.h"
@@ skipping 408 matching lines @@
     temp_file_path = temp_file_path.ReplaceExtension(file_ext);
 
     AccObjectMatcher file_name_box(L"File name:", L"editable text");
     EXPECT_CALL(win_observer_mock, OnWindowOpen(_))
         .WillOnce(testing::DoAll(
             AccSendCharMessage(file_name_box, L'a'),
             AccSetValue(file_name_box, temp_file_path.value()),
             AccDoDefaultAction(AccObjectMatcher(L"Save", L"push button"))));
 
     EXPECT_CALL(win_observer_mock, OnWindowClose(_))
-        .WillOnce(CloseWhenFileSaved(&ie_mock_, temp_file_path, 5000));
+        .WillOnce(CloseWhenFileSaved(&ie_mock_, temp_file_path, 8000));
 
     LaunchIENavigateAndLoop(GetTestUrl(L"save_as_context_menu.html"),
                             kChromeFrameVeryLongNavigationTimeoutInSeconds);
     ASSERT_TRUE(file_util::DieFileDie(temp_file_path, false));
   }
 
  protected:
   // Html page that holds a text field for context menu testing.
   std::wstring context_menu_page_url;
   // This is the text value used to test cut/copy/paste etc.
@@ skipping 118 matching lines @@
   // for more information on why this test is disabled for Vista with IE7.
   if (base::win::GetVersion() == base::win::VERSION_VISTA &&
       GetInstalledIEVersion() == IE_7) {
     LOG(INFO) << "Not running test on Vista with IE7";
     return;
   }
   ASSERT_NO_FATAL_FAILURE(DoSaveAsTest(L"", L"Save as...", L".html"));
 }
 
 // http://code.google.com/p/chromium/issues/detail?id=83114
-TEST_F(ContextMenuTest, DISABLED_CFSaveLinkAs) {
+TEST_F(ContextMenuTest, FLAKY_CFSaveLinkAs) {
   // Please see http://code.google.com/p/chromium/issues/detail?id=60987
   // for more information on why this test is disabled for Vista with IE7.
   if (base::win::GetVersion() == base::win::VERSION_VISTA &&
       GetInstalledIEVersion() == IE_7) {
     LOG(INFO) << "Not running test on Vista with IE7";
     return;
   }
   ASSERT_NO_FATAL_FAILURE(DoSaveAsTest(L"link", L"Save link as...", L".zip"));
 }
 
@@ skipping 387 matching lines @@
       .WillOnce(AccLeftClick(AccObjectMatcher(L"Forward")));
 
   EXPECT_CALL(ie_mock_, OnLoad(IN_CF, StrEq(page3)))
       .WillOnce(CloseBrowserMock(&ie_mock_));
 
   LaunchIENavigateAndLoop(page1,
                           kChromeFrameVeryLongNavigationTimeoutInSeconds);
 }
 
 }  // namespace chrome_frame_test