From 317e5022090f754f205140eb0e72da92ed725da8 Mon Sep 17 00:00:00 2001 From: "creis@google.com" Date: Fri, 25 Mar 2011 17:03:54 +0000 Subject: Fix flakiness and enable RenderViewHostManagerTest on Linux/Mac. BUG=67532 TEST=browser_tests --gtest_filter=RenderViewHostManagerTest.* Review URL: http://codereview.chromium.org/6730016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79416 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/ssl/ssl_browser_tests.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chrome/browser/ssl') diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index d35d90a..5729075 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -414,7 +414,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSErrorWithNoNavEntry) { GURL url = https_server_expired_.GetURL("files/ssl/google.htm"); TabContentsWrapper* tab2 = browser()->AddSelectedTabWithURL(url, PageTransition::TYPED); - ui_test_utils::WaitForLoadStop(&(tab2->controller())); + ui_test_utils::WaitForLoadStop(tab2->tab_contents()); // Verify our assumption that there was no prior navigation. EXPECT_FALSE(browser()->command_updater()->IsCommandEnabled(IDC_BACK)); -- cgit v1.1