Relands "Removed InProcessBrowserTest::CleanUpOnMainThread()"

chrome/browser/dom_distiller/dom_distiller_viewer_source_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 <string.h>
 
 #include "base/command_line.h"
 #include "base/guid.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 69 matching lines @@
 
 class DomDistillerViewerSourceBrowserTest : public InProcessBrowserTest {
  public:
   DomDistillerViewerSourceBrowserTest() {}
   virtual ~DomDistillerViewerSourceBrowserTest() {}
 
   virtual void SetUpOnMainThread() OVERRIDE {
     database_model_ = new FakeDB<ArticleEntry>::EntryMap;
   }
 
-  virtual void CleanUpOnMainThread() OVERRIDE { delete database_model_; }
+  virtual void TearDownOnMainThread() OVERRIDE { delete database_model_; }
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     command_line->AppendSwitch(switches::kEnableDomDistiller);
   }
 
   static KeyedService* Build(content::BrowserContext* context) {
     FakeDB<ArticleEntry>* fake_db = new FakeDB<ArticleEntry>(database_model_);
     distiller_factory_ = new MockDistillerFactory();
     MockDistillerPageFactory* distiller_page_factory_ =
         new MockDistillerPageFactory();
@@ skipping 250 matching lines @@
             browser()->profile())->GetDistilledPagePrefs();
 
   distilled_page_prefs->SetTheme(DistilledPagePrefs::DARK);
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(content::ExecuteScriptAndExtractString(
       contents, kGetBodyClass, &result));
   EXPECT_EQ("dark", result);
 }
 
 }  // namespace dom_distiller