From ad35497a619d67e59dab69f890af3bba65bb6473 Mon Sep 17 00:00:00 2001 From: "atwilson@chromium.org" Date: Fri, 25 Jul 2014 18:58:20 +0000 Subject: Relands "Removed InProcessBrowserTest::CleanUpOnMainThread()" This reverts r285278 and re-lands r285173 with a fix for a chromeos test. Originally landed as https://codereview.chromium.org/366813007. BUG=381181 TBR=jam Review URL: https://codereview.chromium.org/419523003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285636 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc | 2 +- chrome/browser/policy/cloud/device_management_service_browsertest.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'chrome/browser/policy/cloud') diff --git a/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc b/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc index 518d376..80ed8ee 100644 --- a/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc +++ b/chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc @@ -85,7 +85,7 @@ class CloudPolicyManagerTest : public InProcessBrowserTest { #endif } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { // Verify that all the expected requests were handled. EXPECT_EQ(0u, interceptor_->GetPendingSize()); diff --git a/chrome/browser/policy/cloud/device_management_service_browsertest.cc b/chrome/browser/policy/cloud/device_management_service_browsertest.cc index 6ec8b7d..1cf7a58 100644 --- a/chrome/browser/policy/cloud/device_management_service_browsertest.cc +++ b/chrome/browser/policy/cloud/device_management_service_browsertest.cc @@ -149,7 +149,7 @@ class DeviceManagementServiceIntegrationTest service_->ScheduleInitialization(0); } - virtual void CleanUpOnMainThread() OVERRIDE { + virtual void TearDownOnMainThread() OVERRIDE { service_.reset(); test_server_.reset(); interceptor_.reset(); -- cgit v1.1