diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-25 18:58:20 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-25 18:58:20 +0000 |
| commit | ad35497a619d67e59dab69f890af3bba65bb6473 (patch) | |
| tree | 8a4e2a1408252a378805920efc1f6f97c336c84c /chrome/browser/policy/cloud | |
| parent | f5573bba5874e794a3ebe2d13c50160835f9563c (diff) | |
| download | chromium_src-ad35497a619d67e59dab69f890af3bba65bb6473.zip chromium_src-ad35497a619d67e59dab69f890af3bba65bb6473.tar.gz chromium_src-ad35497a619d67e59dab69f890af3bba65bb6473.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/policy/cloud')
| -rw-r--r-- | chrome/browser/policy/cloud/cloud_policy_manager_browsertest.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/policy/cloud/device_management_service_browsertest.cc | 2 |
2 files changed, 2 insertions, 2 deletions
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(); |