Removed InProcessBrowserTest::CleanUpOnMainThread()

chrome/browser/chromeos/customization_wallpaper_downloader_browsertest.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 <vector>
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
@@ skipping 218 matching lines @@
   virtual void SetUpOnMainThread() OVERRIDE {
     controller_ = ash::Shell::GetInstance()->desktop_background_controller();
     local_state_ = g_browser_process->local_state();
   }
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     command_line->AppendSwitch(chromeos::switches::kLoginManager);
     command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user");
   }
 
-  virtual void CleanUpOnMainThread() OVERRIDE { controller_ = NULL; }
+  virtual void TearDownOnMainThread() OVERRIDE { controller_ = NULL; }
 
  protected:
   void CreateCmdlineWallpapers() {
     cmdline_wallpaper_dir_.reset(new base::ScopedTempDir);
     ASSERT_TRUE(cmdline_wallpaper_dir_->CreateUniqueTempDir());
     wallpaper_manager_test_utils::CreateCmdlineWallpapers(
         *cmdline_wallpaper_dir_, &wallpaper_manager_command_line_);
   }
 
   ash::DesktopBackgroundController* controller_;
@@ skipping 61 matching lines @@
 
   observer.WaitForWallpaperAnimationFinished();
   EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor(
       controller_->GetWallpaper(),
       wallpaper_manager_test_utils::kCustomWallpaperColor));
 
   EXPECT_EQ(2U, url_factory.num_attempts());
 }
 
 }  // namespace chromeos