Removed InProcessBrowserTest::CleanUpOnMainThread()

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

 // Copyright (c) 2012 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/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
@@ skipping 63 matching lines @@
     // The browser might get closed later (and therefore be destroyed), so we
     // save the profile.
     profile_ = browser()->profile();
 
     // Closing the last browser window also releases a module reference. Make
     // sure it's not the last one, so the message loop doesn't quit
     // unexpectedly.
     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_;
 };
 
 // http://crbug.com/177163
 #if defined(OS_WIN) && !defined(NDEBUG)
 #define MAYBE_Standard DISABLED_Standard
 #else
 #define MAYBE_Standard Standard
@@ skipping 215 matching lines @@
 
   // Test 6 - clearDefault
   EXPECT_TRUE(listener10.WaitUntilSatisfied()); // Regular ready
   EXPECT_TRUE(listener_incognito10.WaitUntilSatisfied()); // Incognito ready
   listener10.Reply("ok");
   listener_incognito10.Reply("ok");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
   EXPECT_TRUE(catcher_incognito.GetNextResult()) << catcher.message();
 }