Fix races in CFTxtFieldUndo and CFTxtFieldRedo tests.

chrome_frame/test/ui_test.cc

 // Copyright (c) 2012 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 850 matching lines @@
       .WillOnce(CloseBrowserMock(&ie_mock_));
 
   LaunchIEAndNavigate(context_menu_page_url + L"?action=selectall");
 }
 
 // Test CF text field context menu - undo.
 TEST_F(ContextMenuTest, CFTxtFieldUndo) {
   server_mock_.ExpectAndServeAnyRequests(CFInvocation::MetaTag());
   AccObjectMatcher txtfield_matcher(L"", L"editable text");
 
-  // Change the value of text field to 'A', then invoke 'Undo' context menu item
-  // of text field.
+  // Change the value of text field to 'A'.
   EXPECT_CALL(acc_observer_,
               OnAccDocLoad(TabContentsTitleEq(context_menu_page_title)))
       .WillOnce(testing::DoAll(
-          AccSendCharMessage(txtfield_matcher, L'A'),
-          AccRightClick(txtfield_matcher)));
+          AccWatchForOneValueChange(&acc_observer_, txtfield_matcher),
+          AccSendCharMessage(txtfield_matcher, L'A')));
+  // Bring up the context menu once the value has changed.
+  EXPECT_CALL(acc_observer_, OnAccValueChange(_, _, StrEq(L"A")))
+      .WillOnce(AccRightClick(txtfield_matcher));
+  // Then select "Undo".
   EXPECT_CALL(acc_observer_, OnMenuPopup(_))
       .WillOnce(testing::DoAll(
           AccWatchForOneValueChange(&acc_observer_, txtfield_matcher),
           AccLeftClick(AccObjectMatcher(L"Undo*"))));
 
   // Verify that value has been reset to initial value after undo operation.
   EXPECT_CALL(acc_observer_, OnAccValueChange(_, _, StrEq(kTextFieldInitValue)))
       .WillOnce(CloseBrowserMock(&ie_mock_));
 
   LaunchIEAndNavigate(context_menu_page_url);
 }
 
 // Test CF text field context menu - redo.
 TEST_F(ContextMenuTest, CFTxtFieldRedo) {
   server_mock_.ExpectAndServeAnyRequests(CFInvocation::MetaTag());
   AccObjectMatcher txtfield_matcher(L"", L"editable text");
   InSequence expect_in_sequence_for_scope;
 
-  // Change text field value to 'A', then undo it.
+  // Change text field from its initial value to 'A'.
   EXPECT_CALL(acc_observer_,
               OnAccDocLoad(TabContentsTitleEq(context_menu_page_title)))
       .WillOnce(testing::DoAll(
-          AccSendCharMessage(txtfield_matcher, L'A'),
-          AccRightClick(txtfield_matcher)));
+          AccWatchForOneValueChange(&acc_observer_, txtfield_matcher),
+          AccSendCharMessage(txtfield_matcher, L'A')));
+  // Bring up the context menu.
+  EXPECT_CALL(acc_observer_, OnAccValueChange(_, _, StrEq(L"A")))
+      .WillOnce(AccRightClick(txtfield_matcher));
+  // Select "Undo"
   EXPECT_CALL(acc_observer_, OnMenuPopup(_))
       .WillOnce(testing::DoAll(
           AccWatchForOneValueChange(&acc_observer_, txtfield_matcher),
           AccLeftClick(AccObjectMatcher(L"Undo*"))));
 
-  // After undo operation is done, invoke 'Redo' context menu item.
+  // After undo operation is done, bring up the context menu again.
   EXPECT_CALL(acc_observer_, OnAccValueChange(_, _, StrEq(kTextFieldInitValue)))
+      .WillOnce(AccRightClick(txtfield_matcher));
+  // Select "Redo"
+  EXPECT_CALL(acc_observer_, OnMenuPopup(_))
       .WillOnce(testing::DoAll(
-          AccRightClick(txtfield_matcher),
-          AccWatchForOneValueChange(&acc_observer_, txtfield_matcher)));
-  EXPECT_CALL(acc_observer_, OnMenuPopup(_))
-      .WillOnce(AccLeftClick(AccObjectMatcher(L"Redo*")));
+          AccWatchForOneValueChange(&acc_observer_, txtfield_matcher),
+          AccLeftClick(AccObjectMatcher(L"Redo*"))));
 
-  // After redo operation is done, verify that text field value is reset to its
-  // changed value 'A'.
+  // Verify that text field value is reset to its changed value 'A' and exit.
   EXPECT_CALL(acc_observer_, OnAccValueChange(_, _, StrEq(L"A")))
       .WillOnce(CloseBrowserMock(&ie_mock_));
 
   LaunchIEAndNavigate(context_menu_page_url);
 }
 
 TEST_F(ContextMenuTest, CFBackForward) {
   std::wstring page1 = GetLinkPageUrl();
   std::wstring title1 = GetLinkPageTitle();
   std::wstring page2 = GetSimplePageUrl();
@@ skipping 61 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