| 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 39c5ed365728c6f04fb8f459e78ca80c86823c01..fc960f0d4b9960c7c6c356f0463029da7aa54e2c 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();
|
| }
|
|
|