chrome/browser/errorpage_uitest.cc - Issue 6591044: Replace unnecessary "NavigateToURLBlockUntilNavigationsComplete"

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/errorpage_uitest.cc

Issue 6591044: Replace unnecessary "NavigateToURLBlockUntilNavigationsComplete" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 9 months 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « no previous file | no next file » | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "base/string_util.h"	5 #include "base/string_util.h"

6 #include "base/test/test_timeouts.h"	6 #include "base/test/test_timeouts.h"

7 #include "base/threading/platform_thread.h"	7 #include "base/threading/platform_thread.h"

8 #include "chrome/test/automation/tab_proxy.h"	8 #include "chrome/test/automation/tab_proxy.h"

9 #include "chrome/test/ui/ui_test.h"	9 #include "chrome/test/ui/ui_test.h"

10 #include "chrome/browser/net/url_request_failed_dns_job.h"	10 #include "chrome/browser/net/url_request_failed_dns_job.h"

(...skipping 149 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
160 FilePath(FILE_PATH_LITERAL("iframe_dns_error.html"))));	160 FilePath(FILE_PATH_LITERAL("iframe_dns_error.html"))));

161	161

162 EXPECT_TRUE(GetActiveTab()->GoBack());	162 EXPECT_TRUE(GetActiveTab()->GoBack());

163 EXPECT_TRUE(GetActiveTab()->GoForward());	163 EXPECT_TRUE(GetActiveTab()->GoForward());

164	164

165 EXPECT_TRUE(WaitForTitleMatching(L"Blah"));	165 EXPECT_TRUE(WaitForTitleMatching(L"Blah"));

166 }	166 }

167	167

168 // Checks that the Link Doctor is not loaded when we receive an actual 404 page.	168 // Checks that the Link Doctor is not loaded when we receive an actual 404 page.

169 TEST_F(ErrorPageTest, Page404) {	169 TEST_F(ErrorPageTest, Page404) {

170 NavigateToURLBlockUntilNavigationsComplete(	170 NavigateToURL(URLRequestMockHTTPJob::GetMockUrl(

171 URLRequestMockHTTPJob::GetMockUrl(	171 FilePath(FILE_PATH_LITERAL("page404.html"))));

172 FilePath(FILE_PATH_LITERAL("page404.html"))), 1);

173	172

174 EXPECT_TRUE(WaitForTitleMatching(L"SUCCESS"));	173 EXPECT_TRUE(WaitForTitleMatching(L"SUCCESS"));

175 }	174 }

OLD	NEW