Relands "Removed InProcessBrowserTest::CleanUpOnMainThread()"

chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc

 // Copyright (c) 2013 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 "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/policy/cloud/test_request_interceptor.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 67 matching lines @@
     ASSERT_TRUE(policy_manager());
     policy_manager()->Connect(
         g_browser_process->local_state(),
         g_browser_process->system_request_context(),
         UserCloudPolicyManager::CreateCloudPolicyClient(
             connector->device_management_service(),
             g_browser_process->system_request_context()).Pass());
 #endif
   }
 
-  virtual void CleanUpOnMainThread() OVERRIDE {
+  virtual void TearDownOnMainThread() OVERRIDE {
     // Verify that all the expected requests were handled.
     EXPECT_EQ(0u, interceptor_->GetPendingSize());
 
     interceptor_.reset();
   }
 
 #if defined(OS_CHROMEOS)
   UserCloudPolicyManagerChromeOS* policy_manager() {
     return UserCloudPolicyManagerFactoryChromeOS::GetForProfile(
         browser()->profile());
@@ skipping 94 matching lines @@
   const bool expect_reregister = true;
   interceptor_->PushJobCallback(
       TestRequestInterceptor::RegisterJob(expected_type, expect_reregister));
 
   EXPECT_FALSE(policy_manager()->core()->client()->is_registered());
   ASSERT_NO_FATAL_FAILURE(Register());
   EXPECT_TRUE(policy_manager()->core()->client()->is_registered());
 }
 
 }  // namespace policy