Removed InProcessBrowserTest::CleanUpOnMainThread()

chrome/test/base/web_ui_browser_test.cc

 // 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.
 
 #include "chrome/test/base/web_ui_browser_test.h"
 
 #include <string>
 #include <vector>
 
 #include "base/lazy_instance.h"
@@ skipping 364 matching lines @@
       ChromeWebUIControllerFactory::GetInstance());
 
   test_factory_.reset(new TestChromeWebUIControllerFactory);
 
   content::WebUIControllerFactory::RegisterFactory(test_factory_.get());
 
   test_factory_->AddFactoryOverride(GURL(kDummyURL).host(),
                                     mock_provider_.Pointer());
 }
 
-void WebUIBrowserTest::CleanUpOnMainThread() {
+void WebUIBrowserTest::TearDownOnMainThread() {
   logging::SetLogMessageHandler(NULL);
 
   test_factory_->RemoveFactoryOverride(GURL(kDummyURL).host());
   content::WebUIControllerFactory::UnregisterFactoryForTesting(
       test_factory_.get());
 
   // This is needed to avoid a debug assert after the test completes, see stack
   // trace in http://crrev.com/179347
   content::WebUIControllerFactory::RegisterFactory(
       ChromeWebUIControllerFactory::GetInstance());
@@ skipping 80 matching lines @@
 }
 
 GURL WebUIBrowserTest::WebUITestDataPathToURL(
     const base::FilePath::StringType& path) {
   base::FilePath dir_test_data;
   EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &dir_test_data));
   base::FilePath test_path(dir_test_data.Append(kWebUITestFolder).Append(path));
   EXPECT_TRUE(base::PathExists(test_path));
   return net::FilePathToFileURL(test_path);
 }