Removed InProcessBrowserTest::CleanUpOnMainThread()

chrome/browser/apps/drive/drive_app_provider_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 "chrome/browser/apps/drive/drive_app_provider.h"
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
@@ skipping 59 matching lines @@
     fake_drive_service_->LoadAppListForDriveApi("drive/applist_empty.json");
     apps_registry_.reset(
         new drive::DriveAppRegistry(fake_drive_service_.get()));
 
     provider_.reset(new DriveAppProvider(profile()));
     provider_->SetDriveServiceBridgeForTest(
         make_scoped_ptr(new TestDriveServiceBridge(apps_registry_.get()))
             .PassAs<DriveServiceBridge>());
   }
 
-  virtual void CleanUpOnMainThread() OVERRIDE {
+  virtual void TearDownOnMainThread() OVERRIDE {
     provider_.reset();
     apps_registry_.reset();
     fake_drive_service_.reset();
 
-    ExtensionBrowserTest::CleanUpOnMainThread();
+    ExtensionBrowserTest::TearDownOnMainThread();
   }
 
   const Extension* InstallChromeApp(int expected_change) {
     base::FilePath test_data_path;
     if (!PathService::Get(chrome::DIR_TEST_DATA, &test_data_path)) {
       ADD_FAILURE();
       return NULL;
     }
     test_data_path =
         test_data_path.AppendASCII("extensions").AppendASCII("hosted_app.crx");
@@ skipping 348 matching lines @@
   InstallUserUrlApp(kLaunchUrl);
   EXPECT_FALSE(mapping()->IsChromeAppGenerated(url_app_id));
 
   fake_drive_service()->RemoveAppByProductId(kChromeAppId);
   RefreshDriveAppRegistry();
 
   // Url app is still present after the Drive app is disconnected.
   EXPECT_TRUE(ExtensionRegistry::Get(profile())->GetExtensionById(
       url_app_id, ExtensionRegistry::EVERYTHING));
 }