Index: chrome_frame/test/ui_test.cc |
diff --git a/chrome_frame/test/ui_test.cc b/chrome_frame/test/ui_test.cc |
index 9d1036382f981fbf846bca034ed0b81523dbd6f0..bbcb4cac58879c836a3944b82aea8fc95150706d 100644 |
--- a/chrome_frame/test/ui_test.cc |
+++ b/chrome_frame/test/ui_test.cc |
@@ -114,7 +114,7 @@ TEST_P(FullTabUITest, DISABLED_KeyboardBackForward) { |
// Tests new window behavior with ctrl+N. |
// Flaky due to DelaySendChar; see http://crbug.com/124244. |
-TEST_P(FullTabUITest, FLAKY_CtrlN) { |
+TEST_P(FullTabUITest, DISABLED_CtrlN) { |
if (IsWorkstationLocked()) { |
LOG(ERROR) << "This test cannot be run in a locked workstation."; |
return; |
@@ -156,7 +156,7 @@ TEST_P(FullTabUITest, FLAKY_CtrlN) { |
// Test that Ctrl+F opens the Find dialog. |
// Flaky due to DelaySendChar; see http://crbug.com/124244. |
-TEST_P(FullTabUITest, FLAKY_CtrlF) { |
+TEST_P(FullTabUITest, DISABLED_CtrlF) { |
if (IsWorkstationLocked()) { |
LOG(ERROR) << "This test cannot be run in a locked workstation."; |
return; |
@@ -190,7 +190,7 @@ TEST_P(FullTabUITest, FLAKY_CtrlF) { |
// Test that ctrl+r does cause a refresh. |
// Flaky due to DelaySendChar; see http://crbug.com/124244. |
-TEST_P(FullTabUITest, FLAKY_CtrlR) { |
+TEST_P(FullTabUITest, DISABLED_CtrlR) { |
if (IsWorkstationLocked()) { |
LOG(ERROR) << "This test cannot be run in a locked workstation."; |
return; |
@@ -219,7 +219,7 @@ TEST_P(FullTabUITest, FLAKY_CtrlR) { |
// Test window close with ctrl+w. |
// Flaky due to DelaySendChar; see http://crbug.com/124244. |
-TEST_P(FullTabUITest, FLAKY_CtrlW) { |
+TEST_P(FullTabUITest, DISABLED_CtrlW) { |
if (IsWorkstationLocked()) { |
LOG(ERROR) << "This test cannot be run in a locked workstation."; |
return; |
@@ -240,7 +240,7 @@ TEST_P(FullTabUITest, FLAKY_CtrlW) { |
// Test address bar navigation with Alt+d and URL. |
// Flaky due to TypeUrlInAddressBar; see http://crbug.com/124244. |
-TEST_P(FullTabUITest, FLAKY_AltD) { |
+TEST_P(FullTabUITest, DISABLED_AltD) { |
if (IsWorkstationLocked()) { |
LOG(ERROR) << "This test cannot be run in a locked workstation."; |
return; |
@@ -809,7 +809,7 @@ TEST_F(ContextMenuTest, CFCopyLinkAddress) { |
// Test CF text field context menu - cut. |
// Times out sporadically http://crbug.com/119660. |
-TEST_F(ContextMenuTest, FLAKY_CFTxtFieldCut) { |
+TEST_F(ContextMenuTest, DISABLED_CFTxtFieldCut) { |
server_mock_.ExpectAndServeAnyRequests(CFInvocation::MetaTag()); |
AccObjectMatcher txtfield_matcher(L"", L"editable text"); |
@@ -833,7 +833,7 @@ TEST_F(ContextMenuTest, FLAKY_CFTxtFieldCut) { |
// Test CF text field context menu - copy. |
// Times out sporadically http://crbug.com/119660. |
-TEST_F(ContextMenuTest, FLAKY_CFTxtFieldCopy) { |
+TEST_F(ContextMenuTest, DISABLED_CFTxtFieldCopy) { |
server_mock_.ExpectAndServeAnyRequests(CFInvocation::MetaTag()); |
AccObjectMatcher txtfield_matcher(L"", L"editable text"); |
@@ -859,7 +859,7 @@ TEST_F(ContextMenuTest, FLAKY_CFTxtFieldCopy) { |
// Test CF text field context menu - paste. |
// Times out sporadically http://crbug.com/119660. |
-TEST_F(ContextMenuTest, FLAKY_CFTxtFieldPaste) { |
+TEST_F(ContextMenuTest, DISABLED_CFTxtFieldPaste) { |
server_mock_.ExpectAndServeAnyRequests(CFInvocation::MetaTag()); |
AccObjectMatcher txtfield_matcher(L"", L"editable text"); |
@@ -883,7 +883,7 @@ TEST_F(ContextMenuTest, FLAKY_CFTxtFieldPaste) { |
// Test CF text field context menu - delete. |
// Times out sporadically http://crbug.com/119660. |
-TEST_F(ContextMenuTest, FLAKY_CFTxtFieldDelete) { |
+TEST_F(ContextMenuTest, DISABLED_CFTxtFieldDelete) { |
server_mock_.ExpectAndServeAnyRequests(CFInvocation::MetaTag()); |
AccObjectMatcher txtfield_matcher(L"", L"editable text"); |
@@ -925,7 +925,7 @@ TEST_F(ContextMenuTest, DISABLED_CFTxtFieldSelectAll) { |
// Test CF text field context menu - undo. |
// Times out sporadically http://crbug.com/119660. |
-TEST_F(ContextMenuTest, FLAKY_CFTxtFieldUndo) { |
+TEST_F(ContextMenuTest, DISABLED_CFTxtFieldUndo) { |
server_mock_.ExpectAndServeAnyRequests(CFInvocation::MetaTag()); |
AccObjectMatcher txtfield_matcher(L"", L"editable text"); |
@@ -953,7 +953,7 @@ TEST_F(ContextMenuTest, FLAKY_CFTxtFieldUndo) { |
// Test CF text field context menu - redo. |
// Times out sporadically http://crbug.com/119660. |
-TEST_F(ContextMenuTest, FLAKY_CFTxtFieldRedo) { |
+TEST_F(ContextMenuTest, DISABLED_CFTxtFieldRedo) { |
server_mock_.ExpectAndServeAnyRequests(CFInvocation::MetaTag()); |
AccObjectMatcher txtfield_matcher(L"", L"editable text"); |
InSequence expect_in_sequence_for_scope; |