Fix for ChromeFrame TypeUrl test failures on the IE9 builder. The Address bar...

chrome_frame/test/navigation_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 <string>
 
 #include "base/scoped_comptr_win.h"
 #include "base/test/test_file_util.h"
 #include "base/win/windows_version.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
@@ skipping 27 matching lines @@
     CFInvocation(CFInvocation::NONE)));
 INSTANTIATE_TEST_CASE_P(MetaTag, FullTabNavigationTest, testing::Values(
     CFInvocation(CFInvocation::META_TAG)));
 INSTANTIATE_TEST_CASE_P(HttpHeader, FullTabNavigationTest, testing::Values(
     CFInvocation(CFInvocation::HTTP_HEADER)));
 
 // This tests navigation to a typed URL.
 TEST_P(FullTabNavigationTest, TypeUrl) {
   MockAccEventObserver acc_observer;
   EXPECT_CALL(acc_observer, OnAccDocLoad(_)).Times(testing::AnyNumber());
-  AccObjectMatcher address_matcher(L"Address", L"editable text");
+  AccObjectMatcher address_matcher(L"Address*", L"editable text");
   AccObjectMatcher go_matcher(L"Go*", L"push button");
 
   ie_mock_.ExpectNavigation(IN_IE, GetSimplePageUrl());
   server_mock_.ExpectAndServeRequest(CFInvocation::None(), GetSimplePageUrl());
   // Enter the new url into the address bar.
   EXPECT_CALL(ie_mock_, OnLoad(IN_IE, StrEq(GetSimplePageUrl())))
       .WillOnce(testing::DoAll(
           AccSetValueInBrowser(&ie_mock_, address_matcher, GetAnchorPageUrl(0)),
           AccWatchForOneValueChange(&acc_observer, address_matcher)));
   // Click the go button once the address has changed.
   EXPECT_CALL(acc_observer, OnAccValueChange(_, _, GetAnchorPageUrl(0)))
       .WillOnce(AccLeftClickInBrowser(&ie_mock_, go_matcher));
 
   bool in_cf = GetParam().invokes_cf();
   ie_mock_.ExpectNavigation(in_cf, GetAnchorPageUrl(0));
   server_mock_.ExpectAndServeRequest(GetParam(), GetAnchorPageUrl(0));
   EXPECT_CALL(ie_mock_, OnLoad(in_cf, StrEq(GetAnchorPageUrl(0))))
       .WillOnce(CloseBrowserMock(&ie_mock_));
 
   LaunchIEAndNavigate(GetSimplePageUrl());
 }
 
 // This tests navigation to a typed URL containing an fragment.
 TEST_P(FullTabNavigationTest, TypeAnchorUrl) {
   MockAccEventObserver acc_observer;
   EXPECT_CALL(acc_observer, OnAccDocLoad(_)).Times(testing::AnyNumber());
-  AccObjectMatcher address_matcher(L"Address", L"editable text");
+  AccObjectMatcher address_matcher(L"Address*", L"editable text");
   AccObjectMatcher go_matcher(L"Go*", L"push button");
 
   ie_mock_.ExpectNavigation(IN_IE, GetSimplePageUrl());
   server_mock_.ExpectAndServeRequest(CFInvocation::None(), GetSimplePageUrl());
 
   // Enter the new url into the address bar.
   EXPECT_CALL(ie_mock_, OnLoad(IN_IE, StrEq(GetSimplePageUrl())))
       .WillOnce(testing::DoAll(
           AccSetValueInBrowser(&ie_mock_, address_matcher, GetAnchorPageUrl(1)),
           AccWatchForOneValueChange(&acc_observer, address_matcher)));
@@ skipping 1160 matching lines @@
           &no_referrer_target_opener_window_mock));
 
   EXPECT_CALL(no_referrer_target_opener_window_mock, OnQuit())
       .WillOnce(CloseBrowserMock(&ie_mock_));
 
   LaunchIENavigateAndLoop(initial_url,
                           kChromeFrameLongNavigationTimeoutInSeconds);
 }
 
 }  // namespace chrome_frame_test