Commit c51b6c6a authored by Lei Zhang's avatar Lei Zhang Committed by Commit Bot

Remove TearDown() test functions that just call TearDown().

TBR=halliwell@chromium.org,kbr@chromium.org,kinuko@chromium.org,marq@chromium.org, olka@chromium.org,thakis@chromium.org

Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs;luci.chromium.try:linux_layout_tests_slimming_paint_v2;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel
Change-Id: I40a84a602bfa25f6f38c8a9b1d8fc4015906563b
Reviewed-on: https://chromium-review.googlesource.com/c/1279182
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: default avatarLei Zhang <thestig@chromium.org>
Reviewed-by: default avatarDan Erat <derat@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608276}
parent 2785bf0c
...@@ -227,7 +227,6 @@ class AppListModelFolderTest : public AppListModelTest { ...@@ -227,7 +227,6 @@ class AppListModelFolderTest : public AppListModelTest {
// testing::Test overrides: // testing::Test overrides:
void SetUp() override { AppListModelTest::SetUp(); } void SetUp() override { AppListModelTest::SetUp(); }
void TearDown() override { AppListModelTest::TearDown(); }
private: private:
DISALLOW_COPY_AND_ASSIGN(AppListModelFolderTest); DISALLOW_COPY_AND_ASSIGN(AppListModelFolderTest);
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
namespace ash { namespace ash {
namespace { namespace {
display::ManagedDisplayInfo CreateDisplayInfo(int64_t id, display::ManagedDisplayInfo CreateDisplayInfo(int64_t id,
const gfx::Rect& bounds, const gfx::Rect& bounds,
float scale = 1.f) { float scale = 1.f) {
...@@ -49,7 +50,6 @@ class MirrorOnBootTest : public AshTestBase { ...@@ -49,7 +50,6 @@ class MirrorOnBootTest : public AshTestBase {
::switches::kEnableSoftwareMirroring); ::switches::kEnableSoftwareMirroring);
AshTestBase::SetUp(); AshTestBase::SetUp();
} }
void TearDown() override { AshTestBase::TearDown(); }
private: private:
DISALLOW_COPY_AND_ASSIGN(MirrorOnBootTest); DISALLOW_COPY_AND_ASSIGN(MirrorOnBootTest);
......
...@@ -46,8 +46,6 @@ class LoginMetricsRecorderTest : public LoginTestBase { ...@@ -46,8 +46,6 @@ class LoginMetricsRecorderTest : public LoginTestBase {
histogram_tester_.reset(new base::HistogramTester()); histogram_tester_.reset(new base::HistogramTester());
} }
void TearDown() override { LoginTestBase::TearDown(); }
protected: protected:
void EnableTabletMode(bool enable) { void EnableTabletMode(bool enable) {
Shell::Get()->tablet_mode_controller()->EnableTabletModeWindowManager( Shell::Get()->tablet_mode_controller()->EnableTabletModeWindowManager(
......
...@@ -28,8 +28,6 @@ class StickyKeysTest : public AshTestBase { ...@@ -28,8 +28,6 @@ class StickyKeysTest : public AshTestBase {
root_window_ = target_->GetRootWindow(); root_window_ = target_->GetRootWindow();
} }
void TearDown() override { AshTestBase::TearDown(); }
virtual void OnShortcutPressed() { virtual void OnShortcutPressed() {
if (target_) { if (target_) {
delete target_; delete target_;
......
...@@ -97,8 +97,6 @@ class LockScreenAshFocusRulesTest : public AshTestBase { ...@@ -97,8 +97,6 @@ class LockScreenAshFocusRulesTest : public AshTestBase {
Shell::Get()->session_controller())); Shell::Get()->session_controller()));
} }
void TearDown() override { AshTestBase::TearDown(); }
aura::Window* CreateWindowInDefaultContainer() { aura::Window* CreateWindowInDefaultContainer() {
return CreateWindowInContainer(kShellWindowId_DefaultContainer); return CreateWindowInContainer(kShellWindowId_DefaultContainer);
} }
......
...@@ -36,8 +36,6 @@ class WindowAnimationsTest : public AshTestBase { ...@@ -36,8 +36,6 @@ class WindowAnimationsTest : public AshTestBase {
AshTestBase::SetUp(); AshTestBase::SetUp();
} }
void TearDown() override { AshTestBase::TearDown(); }
private: private:
DISALLOW_COPY_AND_ASSIGN(WindowAnimationsTest); DISALLOW_COPY_AND_ASSIGN(WindowAnimationsTest);
}; };
...@@ -51,7 +49,7 @@ class MinimizeAnimationObserver : public ui::LayerAnimationObserver { ...@@ -51,7 +49,7 @@ class MinimizeAnimationObserver : public ui::LayerAnimationObserver {
animator_->AddObserver(this); animator_->AddObserver(this);
// RemoveObserver is called when the first animation is scheduled and so // RemoveObserver is called when the first animation is scheduled and so
// there should be no need for now to remove it in destructor. // there should be no need for now to remove it in destructor.
}; }
base::TimeDelta duration() { return duration_; } base::TimeDelta duration() { return duration_; }
protected: protected:
......
...@@ -67,8 +67,6 @@ class CastMediaBlockerTest : public content::RenderViewHostTestHarness { ...@@ -67,8 +67,6 @@ class CastMediaBlockerTest : public content::RenderViewHostTestHarness {
media_blocker_ = std::make_unique<CastMediaBlocker>(media_session_.get()); media_blocker_ = std::make_unique<CastMediaBlocker>(media_session_.get());
} }
void TearDown() override { content::RenderViewHostTestHarness::TearDown(); }
void MediaSessionChanged(bool controllable, bool suspended) { void MediaSessionChanged(bool controllable, bool suspended) {
media_blocker_->MediaSessionStateChanged(controllable, suspended); media_blocker_->MediaSessionStateChanged(controllable, suspended);
} }
......
...@@ -74,8 +74,6 @@ class MediaSessionImplUmaTest : public RenderViewHostImplTestHarness { ...@@ -74,8 +74,6 @@ class MediaSessionImplUmaTest : public RenderViewHostImplTestHarness {
StartPlayer(); StartPlayer();
} }
void TearDown() override { RenderViewHostImplTestHarness::TearDown(); }
protected: protected:
MediaSessionImpl* GetSession() { return MediaSessionImpl::Get(contents()); } MediaSessionImpl* GetSession() { return MediaSessionImpl::Get(contents()); }
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread.h"
#include "content/public/browser/trace_uploader.h" #include "content/public/browser/trace_uploader.h"
#include "content/public/browser/tracing_controller.h"
#include "content/public/test/browser_test_utils.h" #include "content/public/test/browser_test_utils.h"
#include "content/public/test/content_browser_test.h" #include "content/public/test/content_browser_test.h"
#include "content/public/test/content_browser_test_utils.h" #include "content/public/test/content_browser_test_utils.h"
...@@ -128,8 +127,6 @@ class TracingControllerTest : public ContentBrowserTest { ...@@ -128,8 +127,6 @@ class TracingControllerTest : public ContentBrowserTest {
ContentBrowserTest::SetUp(); ContentBrowserTest::SetUp();
} }
void TearDown() override { ContentBrowserTest::TearDown(); }
void Navigate(Shell* shell) { void Navigate(Shell* shell) {
NavigateToURL(shell, GetTestUrl("", "title.html")); NavigateToURL(shell, GetTestUrl("", "title.html"));
} }
......
...@@ -43,8 +43,6 @@ class MailboxManagerTest : public GpuServiceTest { ...@@ -43,8 +43,6 @@ class MailboxManagerTest : public GpuServiceTest {
DCHECK(manager_->UsesSync()); DCHECK(manager_->UsesSync());
} }
void TearDown() override { GpuServiceTest::TearDown(); }
Texture* CreateTexture() { Texture* CreateTexture() {
return new Texture(1); return new Texture(1);
} }
......
...@@ -38,8 +38,6 @@ class OpenInControllerTest : public PlatformTest { ...@@ -38,8 +38,6 @@ class OpenInControllerTest : public PlatformTest {
base::MakeRefCounted<network::WeakWrapperSharedURLLoaderFactory>( base::MakeRefCounted<network::WeakWrapperSharedURLLoaderFactory>(
&test_url_loader_factory_)) {} &test_url_loader_factory_)) {}
void TearDown() override { PlatformTest::TearDown(); }
void SetUp() override { void SetUp() override {
PlatformTest::SetUp(); PlatformTest::SetUp();
......
...@@ -495,8 +495,6 @@ class AudioOutputProxyTest : public testing::Test { ...@@ -495,8 +495,6 @@ class AudioOutputProxyTest : public testing::Test {
class AudioOutputResamplerTest : public AudioOutputProxyTest { class AudioOutputResamplerTest : public AudioOutputProxyTest {
public: public:
void TearDown() override { AudioOutputProxyTest::TearDown(); }
void InitDispatcher(base::TimeDelta close_delay) override { void InitDispatcher(base::TimeDelta close_delay) override {
// Use a low sample rate and large buffer size when testing otherwise the // Use a low sample rate and large buffer size when testing otherwise the
// FakeAudioOutputStream will keep the message loop busy indefinitely; i.e., // FakeAudioOutputStream will keep the message loop busy indefinitely; i.e.,
......
...@@ -482,8 +482,6 @@ class AdTrackerDisabledSimTest : public SimTest { ...@@ -482,8 +482,6 @@ class AdTrackerDisabledSimTest : public SimTest {
main_resource_->Start(); main_resource_->Start();
} }
void TearDown() override { SimTest::TearDown(); }
std::unique_ptr<SimRequest> main_resource_; std::unique_ptr<SimRequest> main_resource_;
}; };
......
...@@ -55,8 +55,6 @@ class CompositedLayerMappingTest : public RenderingTest { ...@@ -55,8 +55,6 @@ class CompositedLayerMappingTest : public RenderingTest {
RenderingTest::SetUp(); RenderingTest::SetUp();
EnableCompositing(); EnableCompositing();
} }
void TearDown() override { RenderingTest::TearDown(); }
}; };
// Tests the pre-BlinkGenPropertyTrees composited layer mapping code. With BGPT, // Tests the pre-BlinkGenPropertyTrees composited layer mapping code. With BGPT,
......
...@@ -50,8 +50,6 @@ class WindowAnimationsTest : public aura::test::AuraTestBase { ...@@ -50,8 +50,6 @@ class WindowAnimationsTest : public aura::test::AuraTestBase {
public: public:
WindowAnimationsTest() {} WindowAnimationsTest() {}
void TearDown() override { AuraTestBase::TearDown(); }
private: private:
DISALLOW_COPY_AND_ASSIGN(WindowAnimationsTest); DISALLOW_COPY_AND_ASSIGN(WindowAnimationsTest);
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment