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

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

Issue 10822030: Move ui_test_utils::RunMessageLoop to test_utils so that it can be reused by content_browsertests. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 5 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/bind.h" 5 #include "base/bind.h"
6 #include "base/utf_string_conversions.h" 6 #include "base/utf_string_conversions.h"
7 #include "chrome/browser/net/url_request_mock_util.h" 7 #include "chrome/browser/net/url_request_mock_util.h"
8 #include "chrome/browser/ui/browser.h" 8 #include "chrome/browser/ui/browser.h"
9 #include "chrome/browser/ui/browser_commands.h" 9 #include "chrome/browser/ui/browser_commands.h"
10 #include "chrome/browser/ui/browser_tabstrip.h" 10 #include "chrome/browser/ui/browser_tabstrip.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 NULL, 96 NULL,
97 num_navigations); 97 num_navigations);
98 if (direction == HISTORY_NAVIGATE_BACK) { 98 if (direction == HISTORY_NAVIGATE_BACK) {
99 chrome::GoBack(browser(), CURRENT_TAB); 99 chrome::GoBack(browser(), CURRENT_TAB);
100 } else if (direction == HISTORY_NAVIGATE_FORWARD) { 100 } else if (direction == HISTORY_NAVIGATE_FORWARD) {
101 chrome::GoForward(browser(), CURRENT_TAB); 101 chrome::GoForward(browser(), CURRENT_TAB);
102 } else { 102 } else {
103 FAIL(); 103 FAIL();
104 } 104 }
105 test_navigation_observer.WaitForObservation( 105 test_navigation_observer.WaitForObservation(
106 base::Bind(&ui_test_utils::RunMessageLoop), 106 base::Bind(&content::RunMessageLoop),
107 base::Bind(&MessageLoop::Quit, 107 base::Bind(&MessageLoop::Quit,
108 base::Unretained(MessageLoopForUI::current()))); 108 base::Unretained(MessageLoopForUI::current())));
109 109
110 EXPECT_EQ(title_watcher.WaitAndGetTitle(), ASCIIToUTF16(expected_title)); 110 EXPECT_EQ(title_watcher.WaitAndGetTitle(), ASCIIToUTF16(expected_title));
111 } 111 }
112 }; 112 };
113 113
114 // See crbug.com/109669 114 // See crbug.com/109669
115 #if defined(USE_AURA) 115 #if defined(USE_AURA)
116 #define MAYBE_DNSError_Basic DISABLED_DNSError_Basic 116 #define MAYBE_DNSError_Basic DISABLED_DNSError_Basic
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 } 233 }
234 234
235 // Checks that the Link Doctor is not loaded when we receive an actual 404 page. 235 // Checks that the Link Doctor is not loaded when we receive an actual 404 page.
236 IN_PROC_BROWSER_TEST_F(ErrorPageTest, Page404) { 236 IN_PROC_BROWSER_TEST_F(ErrorPageTest, Page404) {
237 NavigateToURLAndWaitForTitle( 237 NavigateToURLAndWaitForTitle(
238 URLRequestMockHTTPJob::GetMockUrl( 238 URLRequestMockHTTPJob::GetMockUrl(
239 FilePath(FILE_PATH_LITERAL("page404.html"))), 239 FilePath(FILE_PATH_LITERAL("page404.html"))),
240 "SUCCESS", 240 "SUCCESS",
241 1); 241 1);
242 } 242 }
OLDNEW
« no previous file with comments | « chrome/browser/download/save_page_browsertest.cc ('k') | chrome/browser/extensions/api/downloads/downloads_api_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698