Removed InProcessBrowserTest::CleanUpOnMainThread()

chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc

 // Copyright 2013 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/bind.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 35 matching lines @@
 
 }  // namespace
 
 class DriveFirstRunTest : public InProcessBrowserTest,
                           public DriveFirstRunController::Observer {
  protected:
   DriveFirstRunTest();
 
   // InProcessBrowserTest overrides:
   virtual void SetUpOnMainThread() OVERRIDE;
-  virtual void CleanUpOnMainThread() OVERRIDE;
+  virtual void TearDownOnMainThread() OVERRIDE;
 
   // DriveFirstRunController::Observer overrides:
   virtual void OnCompletion(bool success) OVERRIDE;
   virtual void OnTimedOut() OVERRIDE;
 
   void InstallApp();
 
   void InitTestServer(const std::string& directory);
 
   bool WaitForFirstRunResult();
@@ skipping 28 matching lines @@
 
   host_resolver()->AddRule("example.com", "127.0.0.1");
 
   // |controller_| will delete itself when it completes.
   controller_ = new DriveFirstRunController(browser()->profile());
   controller_->AddObserver(this);
   controller_->SetDelaysForTest(0, 10);
   controller_->SetAppInfoForTest(kTestAppId, kTestEndpointUrl);
 }
 
-void DriveFirstRunTest::CleanUpOnMainThread() {
-  InProcessBrowserTest::CleanUpOnMainThread();
+void DriveFirstRunTest::TearDownOnMainThread() {
+  InProcessBrowserTest::TearDownOnMainThread();

[jam, 2014/07/14 17:10:05]

nit: remove this since this it's empty by definition

[Andrew T Wilson (Slow), 2014/07/23 12:48:41]

Done.

   content::RunAllPendingInMessageLoop();
 }
 
 void DriveFirstRunTest::InitTestServer(const std::string& directory) {
   embedded_test_server()->ServeFilesFromDirectory(
       test_data_dir_.AppendASCII(directory));
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   // Configure the endpoint to use the test server's port.
   const GURL url(kTestEndpointUrl);
@@ skipping 66 matching lines @@
   // Test that the controller times out instead of hanging forever.
   InstallApp();
   InitTestServer(kBadServerDirectory);
   SetDelays(0, 0);
   EnableOfflineMode();
   EXPECT_FALSE(WaitForFirstRunResult());
   EXPECT_TRUE(timed_out());
 }
 
 }  // namespace chromeos