Relands "Removed InProcessBrowserTest::CleanUpOnMainThread()"

chrome/browser/extensions/api/preference/preference_apitest.cc

Index: chrome/browser/extensions/api/preference/preference_apitest.cc
diff --git a/chrome/browser/extensions/api/preference/preference_apitest.cc b/chrome/browser/extensions/api/preference/preference_apitest.cc
index 618e8dac9ce3f7f6d89b6cb5c2ebe17808ed86f4..71b8afd7d88709e915f1c19fd8d9b53cb2d0ed70 100644
--- a/chrome/browser/extensions/api/preference/preference_apitest.cc
+++ b/chrome/browser/extensions/api/preference/preference_apitest.cc
@@ -81,14 +81,14 @@ class ExtensionPreferenceApiTest : public ExtensionApiTest {
     g_browser_process->AddRefModule();
   }
 
-  virtual void CleanUpOnMainThread() OVERRIDE {
+  virtual void TearDownOnMainThread() OVERRIDE {
     // ReleaseBrowserProcessModule() needs to be called in a message loop, so we
     // post a task to do it, then run the message loop.
     base::MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(&ReleaseBrowserProcessModule));
     content::RunAllPendingInMessageLoop();
 
-    ExtensionApiTest::CleanUpOnMainThread();
+    ExtensionApiTest::TearDownOnMainThread();
   }
 
   Profile* profile_;