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

Side by Side Diff: chrome/browser/ui/webui/bookmarks_ui_browsertest.cc

Issue 2952163002: Remove InProcessBrowserTest::SetUpOnMainThread() calls. (Closed)
Patch Set: rebase Created 3 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
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/test/test_timeouts.h" 5 #include "base/test/test_timeouts.h"
6 #include "build/build_config.h" 6 #include "build/build_config.h"
7 #include "chrome/browser/ui/browser.h" 7 #include "chrome/browser/ui/browser.h"
8 #include "chrome/browser/ui/chrome_pages.h" 8 #include "chrome/browser/ui/chrome_pages.h"
9 #include "chrome/browser/ui/tabs/tab_strip_model.h" 9 #include "chrome/browser/ui/tabs/tab_strip_model.h"
10 #include "chrome/browser/ui/webui/md_bookmarks/md_bookmarks_ui.h" 10 #include "chrome/browser/ui/webui/md_bookmarks/md_bookmarks_ui.h"
11 #include "chrome/common/url_constants.h" 11 #include "chrome/common/url_constants.h"
12 #include "chrome/test/base/in_process_browser_test.h" 12 #include "chrome/test/base/in_process_browser_test.h"
13 #include "chrome/test/base/ui_test_utils.h" 13 #include "chrome/test/base/ui_test_utils.h"
14 #include "content/public/browser/notification_service.h" 14 #include "content/public/browser/notification_service.h"
15 #include "content/public/browser/web_contents.h" 15 #include "content/public/browser/web_contents.h"
16 #include "content/public/test/browser_test_utils.h" 16 #include "content/public/test/browser_test_utils.h"
17 #include "content/public/test/test_navigation_observer.h" 17 #include "content/public/test/test_navigation_observer.h"
18 18
19 class BookmarksTest : public InProcessBrowserTest { 19 class BookmarksTest : public InProcessBrowserTest {
20 public: 20 public:
21 BookmarksTest() {} 21 BookmarksTest() {}
22 22
23 void SetUpOnMainThread() override { 23 void SetUpOnMainThread() override {
24 InProcessBrowserTest::SetUpOnMainThread();
25
26 // Re-enable accessibility checks when audit failures are resolved. 24 // Re-enable accessibility checks when audit failures are resolved.
27 // AX_TEXT_01: http://crbug.com/559201 25 // AX_TEXT_01: http://crbug.com/559201
28 // AX_ARIA_08: http://crbug.com/559202 26 // AX_ARIA_08: http://crbug.com/559202
29 // EnableAccessibilityChecksForTestCase(true); 27 // EnableAccessibilityChecksForTestCase(true);
30 } 28 }
31 29
32 void OpenBookmarksManager() { 30 void OpenBookmarksManager() {
33 content::TestNavigationObserver navigation_observer( 31 content::TestNavigationObserver navigation_observer(
34 browser()->tab_strip_model()->GetActiveWebContents(), 32 browser()->tab_strip_model()->GetActiveWebContents(),
35 MdBookmarksUI::IsEnabled() ? 1 : 2); 33 MdBookmarksUI::IsEnabled() ? 1 : 2);
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 navigation_observer.Wait(); 111 navigation_observer.Wait();
114 112
115 ASSERT_EQ(1, browser()->tab_strip_model()->count()); 113 ASSERT_EQ(1, browser()->tab_strip_model()->count());
116 } 114 }
117 115
118 IN_PROC_BROWSER_TEST_F(BookmarksTest, BookmarksLoaded) { 116 IN_PROC_BROWSER_TEST_F(BookmarksTest, BookmarksLoaded) {
119 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIBookmarksURL)); 117 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIBookmarksURL));
120 ASSERT_EQ(1, browser()->tab_strip_model()->count()); 118 ASSERT_EQ(1, browser()->tab_strip_model()->count());
121 AssertIsBookmarksPage(browser()->tab_strip_model()->GetActiveWebContents()); 119 AssertIsBookmarksPage(browser()->tab_strip_model()->GetActiveWebContents());
122 } 120 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698