chrome/browser/chromeos/login/existing_user_controller_browsertest.cc - Issue 366813007: Removed InProcessBrowserTest::CleanUpOnMainThread()

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/chromeos/login/existing_user_controller_browsertest.cc

Issue 366813007: Removed InProcessBrowserTest::CleanUpOnMainThread() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Removed superfluous override. Created 6 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc ('k') | chrome/browser/chromeos/login/kiosk_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/existing_user_controller_browsertest.cc

diff --git a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc

index 5c6b26d0095caa13a82a9b08bbdeb95557ed9604..63ceb35dcf278dce8fd4aa41439cff69a7f4a064 100644

--- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc

+++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc

@@ -175,14 +175,14 @@ class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest {

testing_profile_.get());

}

- virtual void CleanUpOnMainThread() OVERRIDE {

+ virtual void TearDownOnMainThread() OVERRIDE {

// ExistingUserController must be deleted before the thread is cleaned up:

// If there is an outstanding login attempt when ExistingUserController is

// deleted, its LoginPerformer instance will be deleted, which in turn

// deletes its OnlineAttemptHost instance. However, OnlineAttemptHost must

// be deleted on the UI thread.

existing_user_controller_.reset();

- DevicePolicyCrosBrowserTest::InProcessBrowserTest::CleanUpOnMainThread();

+ DevicePolicyCrosBrowserTest::InProcessBrowserTest::TearDownOnMainThread();

testing_profile_.reset(NULL);

user_manager_enabler_.reset();

}