chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc - Issue 2832153003: Move calling of shared browser test methods like SetUpOnMainThread/TearDownOnMainThread/RunTestOn...

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

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc

Issue 2832153003: Move calling of shared browser test methods like SetUpOnMainThread/TearDownOnMainThread/RunTestOn... (Closed)

Patch Set: sync Created 3 years, 8 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.cc ('k') | chrome/test/base/in_process_browser_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc

index f7a63ac7f9ff9925e532759b9c8b9d4c61dfa971..55ab62259789e4f429f04da45693f7aced57410b 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc

@@ -224,13 +224,13 @@ class LauncherPlatformAppBrowserTest

~LauncherPlatformAppBrowserTest() override {}

- void RunTestOnMainThreadLoop() override {

+ void SetUpOnMainThread() override {

// Ensure ash starts the session and creates the shelf and controller.

SessionControllerClient::FlushForTesting();

controller_ = GetChromeLauncherControllerImpl();

ASSERT_TRUE(controller_);

- return extensions::PlatformAppBrowserTest::RunTestOnMainThreadLoop();

+ extensions::PlatformAppBrowserTest::SetUpOnMainThread();

}

ash::ShelfModel* shelf_model() { return ash::Shell::Get()->shelf_model(); }

@@ -281,7 +281,7 @@ class ShelfAppBrowserTest : public ExtensionBrowserTest {

~ShelfAppBrowserTest() override {}

- void RunTestOnMainThreadLoop() override {

+ void SetUpOnMainThread() override {

// Ensure ash starts the session and creates the shelf and controller.

SessionControllerClient::FlushForTesting();

@@ -290,7 +290,7 @@ class ShelfAppBrowserTest : public ExtensionBrowserTest {

model_ = ash::Shell::Get()->shelf_model();

controller_ = GetChromeLauncherControllerImpl();

ASSERT_TRUE(controller_);

- return ExtensionBrowserTest::RunTestOnMainThreadLoop();

+ ExtensionBrowserTest::SetUpOnMainThread();

}

size_t NumberOfDetectedLauncherBrowsers(bool show_all_tabs) {