Removed InProcessBrowserTest::CleanUpOnMainThread()

chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate_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 "base/command_line.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/policy/cloud/policy_header_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h"
@@ skipping 116 matching lines @@
     std::vector<policy::PolicyHeaderIOHelper*> helpers =
         policy_header_service->GetHelpersForTest();
     for (std::vector<policy::PolicyHeaderIOHelper*>::const_iterator it =
              helpers.begin();
          it != helpers.end(); ++it) {
       (*it)->SetServerURLForTest(dm_url_.spec());
       (*it)->UpdateHeader(kTestPolicyHeader);
     }
   }
 
-  virtual void CleanUpOnMainThread() OVERRIDE {
+  virtual void TearDownOnMainThread() OVERRIDE {
     content::ResourceDispatcherHost::Get()->SetDelegate(NULL);
     dispatcher_host_delegate_.reset();
-    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:
   // The fake URL for DMServer we are using.
   GURL dm_url_;
   scoped_ptr<TestDispatcherHostDelegate> dispatcher_host_delegate_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ChromeResourceDispatcherHostDelegateBrowserTest);
 };
@@ skipping 29 matching lines @@
   redirect_url += kServerRedirectUrl;
   redirect_url += "?";
   redirect_url += dm_url_.spec();
   ui_test_utils::NavigateToURL(browser(), embedded_test_server()->GetURL(
       redirect_url));
   std::string value;
   ASSERT_TRUE(dispatcher_host_delegate_->request_headers_.GetHeader(
       policy::kChromePolicyHeader, &value));
   ASSERT_EQ(kTestPolicyHeader, value);
 }