Removed InProcessBrowserTest::CleanUpOnMainThread()

chrome/browser/password_manager/password_manager_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 <string>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram_samples.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/run_loop.h"
@@ skipping 166 matching lines @@
     // Use TestPasswordStore to remove a possible race. Normally the
     // PasswordStore does its database manipulation on the DB thread, which
     // creates a possible race during navigation. Specifically the
     // PasswordManager will ignore any forms in a page if the load from the
     // PasswordStore has not completed.
     PasswordStoreFactory::GetInstance()->SetTestingFactory(
         browser()->profile(), TestPasswordStoreService::Build);
     ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
   }
 
-  virtual void CleanUpOnMainThread() OVERRIDE {
+  virtual void TearDownOnMainThread() OVERRIDE {
     ASSERT_TRUE(embedded_test_server()->ShutdownAndWaitUntilComplete());
-    InProcessBrowserTest::CleanUpOnMainThread();
+    InProcessBrowserTest::TearDownOnMainThread();

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

nit: remove

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

Done.

   }
 
  protected:
   content::WebContents* WebContents() {
     return browser()->tab_strip_model()->GetActiveWebContents();
   }
 
   content::RenderViewHost* RenderViewHost() {
     return WebContents()->GetRenderViewHost();
   }
@@ skipping 878 matching lines @@
     ui_controller()->SavePassword();
   } else {
     EXPECT_TRUE(nav_observer.infobar_shown());
   }
   // Spin the message loop to make sure the password store had a chance to save
   // the password.
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
   EXPECT_FALSE(password_store->IsEmpty());
 }