Removed InProcessBrowserTest::CleanUpOnMainThread()

chrome/browser/extensions/api/content_settings/content_settings_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/content_settings/cookie_settings.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
@@ skipping 35 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();
   }
 
  protected:
   void CheckContentSettingsSet() {
     HostContentSettingsMap* map =
         profile_->GetHostContentSettingsMap();
     CookieSettings* cookie_settings =
         CookieSettings::Factory::GetForProfile(profile_).get();
 
     // Check default content settings by using an unknown URL.
@@ skipping 155 matching lines @@
                            base::FilePath(kBarPath),
                            base::ASCIIToUTF16("2.3.4"),
                            base::ASCIIToUTF16("bar")),
       false);
 
   EXPECT_TRUE(RunExtensionTest("content_settings/getresourceidentifiers"))
       << message_;
 }
 
 }  // namespace extensions