Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2880)

Unified Diff: chrome/browser/session_history_uitest.cc

Issue 431008: Make SystemMonitor not a Singleton and move it out of base (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: fix ChromeFrame build Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/profile_manager.cc ('k') | chrome/browser/tabs/tab_strip_model_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/session_history_uitest.cc
diff --git a/chrome/browser/session_history_uitest.cc b/chrome/browser/session_history_uitest.cc
index fe06d8b8ba10c2dd7cc4b4b55dd5135fd7979173..7f2b65a93701f97ab552f2ac16ebeae2edc703b0 100644
--- a/chrome/browser/session_history_uitest.cc
+++ b/chrome/browser/session_history_uitest.cc
@@ -492,8 +492,9 @@ TEST_F(SessionHistoryTest, FLAKY_LocationReplace) {
HTTPTestServer::CreateServer(kDocRoot, NULL);
ASSERT_TRUE(NULL != server.get());
- ASSERT_TRUE(tab_->NavigateToURL(server->TestServerPage(
- "files/session_history/replace.html?no-title.html")));
+ ASSERT_TRUE(tab_->NavigateToURLBlockUntilNavigationsComplete(
Mike Belshe 2009/11/26 17:03:12 Is this an accidental file inclusion to this CL?
+ server->TestServerPage(
+ "files/session_history/replace.html?no-title.html"), 2));
EXPECT_EQ(L"", GetTabTitle());
}
« no previous file with comments | « chrome/browser/profile_manager.cc ('k') | chrome/browser/tabs/tab_strip_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698