Relands "Removed InProcessBrowserTest::CleanUpOnMainThread()"

chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/supervised/supervised_user_test_base.h"
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/run_loop.h"
@@ skipping 185 matching lines @@
   network_portal_detector_ = new NetworkPortalDetectorTestImpl();
   NetworkPortalDetector::InitializeForTesting(network_portal_detector_);
   NetworkPortalDetector::CaptivePortalState online_state;
   online_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE;
   online_state.response_code = 204;
   network_portal_detector_->SetDefaultNetworkForTesting(kStubEthernetGuid);
   network_portal_detector_->SetDetectionResultsForTesting(kStubEthernetGuid,
                                                           online_state);
 }
 
-void SupervisedUserTestBase::CleanUpOnMainThread() {
-  LoginManagerTest::CleanUpOnMainThread();
-}
-
 void SupervisedUserTestBase::TearDown() {
   cryptohome::AsyncMethodCaller::Shutdown();
   cryptohome::HomedirMethods::Shutdown();
   mock_homedir_methods_ = NULL;
   mock_async_method_caller_ = NULL;
   LoginManagerTest::TearDown();
 }
 
 void SupervisedUserTestBase::TearDownInProcessBrowserTestFixture() {
   NetworkPortalDetector::Shutdown();
@@ skipping 210 matching lines @@
   // Confirm deletion.
   JSEval(StringPrintf(
       "$('pod-row').pods[%d].querySelector('.remove-warning-button').click()",
       user_index));
 
   // Make sure there is no supervised user in list.
   ASSERT_EQ(original_user_count - 1, UserManager::Get()->GetUsers().size());
 }
 
 }  // namespace chromeos