Relands "Removed InProcessBrowserTest::CleanUpOnMainThread()"

chrome/browser/ui/search/instant_extended_interactive_uitest.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 <sstream>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram_base.h"
 #include "base/metrics/histogram_samples.h"
 #include "base/metrics/statistics_recorder.h"
@@ skipping 275 matching lines @@
 };
 
 class InstantExtendedNetworkTest : public InstantExtendedTest {
  protected:
   virtual void SetUpOnMainThread() OVERRIDE {
     disable_for_test_.reset(new net::NetworkChangeNotifier::DisableForTest);
     fake_network_change_notifier_.reset(new FakeNetworkChangeNotifier);
     InstantExtendedTest::SetUpOnMainThread();
   }
 
-  virtual void CleanUpOnMainThread() OVERRIDE {
-    InstantExtendedTest::CleanUpOnMainThread();
+  virtual void TearDownOnMainThread() OVERRIDE {
+    InstantExtendedTest::TearDownOnMainThread();
     fake_network_change_notifier_.reset();
     disable_for_test_.reset();
   }
 
   void SetConnectionType(net::NetworkChangeNotifier::ConnectionType type) {
     fake_network_change_notifier_->SetConnectionType(type);
   }
 
  private:
   scoped_ptr<net::NetworkChangeNotifier::DisableForTest> disable_for_test_;
@@ skipping 666 matching lines @@
   stream << "link.href = \"" << result_url.spec() << "\";";
   stream << "document.body.appendChild(link);";
   stream << "link.click();";
   EXPECT_TRUE(content::ExecuteScript(contents, stream.str()));
 
   content::WaitForLoadStop(contents);
   std::string expected_title =
       "Referrer is " + instant_url().GetWithEmptyPath().spec();
   EXPECT_EQ(ASCIIToUTF16(expected_title), contents->GetTitle());
 }