Fix chrome frame tests which regressed after my change to only route content initiated navigations back to the

host browser. The regression occurred because of a check for whether the navigation type is link clicked, which
is not needed anymore.

Increased the timeout for ChromeFrameTestWithWebServer.FullTabModeIE_TestMultipleGet test which fails randomly on
my machine and on some of the builders.

BUG=none
TEST=ChromeFrame tests should now pass.
Review URL: http://codereview.chromium.org/6882104

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

1 files changed, 3 insertions, 1 deletions

diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc
index cfb6b34..4c01e6c 100644
--- a/chrome_frame/test/test_with_web_server.cc
+++ b/chrome_frame/test/test_with_web_server.cc
@@ -24,6 +24,8 @@
 #include "net/http/http_util.h"
 
 using chrome_frame_test::kChromeFrameLongNavigationTimeoutInSeconds;
+using chrome_frame_test::kChromeFrameVeryLongNavigationTimeoutInSeconds;
+
 using testing::_;
 using testing::StrCaseEq;
 
@@ -1003,7 +1005,7 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_TestMultipleGet) {
 
   ASSERT_TRUE(LaunchBrowser(IE, server.FormatHttpPath(kPages[0]).c_str()));
 
-  loop_.RunFor(kChromeFrameLongNavigationTimeoutInSeconds);
+  loop_.RunFor(kChromeFrameVeryLongNavigationTimeoutInSeconds);
 
   const test_server::Request* request = NULL;
   server.FindRequest("/quit?OK", &request);