Relands "Removed InProcessBrowserTest::CleanUpOnMainThread()"

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

 // 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.
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_TEST_BASE_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_TEST_BASE_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
@@ skipping 52 matching lines @@
   SupervisedUserSharedSettingsService* service_;
   int next_sync_data_id_;
 };
 
 class SupervisedUserTestBase : public chromeos::LoginManagerTest {
  public:
   SupervisedUserTestBase();
   virtual ~SupervisedUserTestBase();
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE;
-  virtual void CleanUpOnMainThread() OVERRIDE;
 
  protected:
   virtual void TearDown() OVERRIDE;
 
   virtual void TearDownInProcessBrowserTestFixture() OVERRIDE;
 
   void JSEval(const std::string& script);
 
   void JSExpectAsync(const std::string& function);
 
@@ skipping 22 matching lines @@
       shared_settings_adapter_;
   scoped_ptr<SupervisedUsersSyncTestAdapter> supervised_users_adapter_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SupervisedUserTestBase);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_TEST_BASE_H_