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

[email protected],[email protected],[email protected],[email protected], [email protected],[email protected] 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 <[email protected]> Reviewed-by: Lei Zhang <[email protected]> Reviewed-by: Dan Erat <[email protected]> Cr-Commit-Position: refs/heads/master@{#608276}
feiyue1206 · Nov 15, 2018 · c51b6c6 · c51b6c6
1 parent 2785bf0
commit c51b6c6
Show file tree

Hide file tree

Showing 15 changed files with 2 additions and 30 deletions.
diff --git a/ash/app_list/model/app_list_model_unittest.cc b/ash/app_list/model/app_list_model_unittest.cc
@@ -227,7 +227,6 @@ class AppListModelFolderTest : public AppListModelTest {
 
   // testing::Test overrides:
   void SetUp() override { AppListModelTest::SetUp(); }
-  void TearDown() override { AppListModelTest::TearDown(); }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AppListModelFolderTest);

diff --git a/ash/display/mirror_window_controller_unittest.cc b/ash/display/mirror_window_controller_unittest.cc
@@ -27,6 +27,7 @@
 namespace ash {
 
 namespace {
+
 display::ManagedDisplayInfo CreateDisplayInfo(int64_t id,
                                               const gfx::Rect& bounds,
                                               float scale = 1.f) {
@@ -49,7 +50,6 @@ class MirrorOnBootTest : public AshTestBase {
         ::switches::kEnableSoftwareMirroring);
     AshTestBase::SetUp();
   }
-  void TearDown() override { AshTestBase::TearDown(); }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MirrorOnBootTest);

diff --git a/ash/metrics/login_metrics_recorder_unittest.cc b/ash/metrics/login_metrics_recorder_unittest.cc
@@ -46,8 +46,6 @@ class LoginMetricsRecorderTest : public LoginTestBase {
     histogram_tester_.reset(new base::HistogramTester());
   }
 
-  void TearDown() override { LoginTestBase::TearDown(); }
-
  protected:
   void EnableTabletMode(bool enable) {
     Shell::Get()->tablet_mode_controller()->EnableTabletModeWindowManager(

diff --git a/ash/sticky_keys/sticky_keys_unittest.cc b/ash/sticky_keys/sticky_keys_unittest.cc
@@ -28,8 +28,6 @@ class StickyKeysTest : public AshTestBase {
     root_window_ = target_->GetRootWindow();
   }
 
-  void TearDown() override { AshTestBase::TearDown(); }
-
   virtual void OnShortcutPressed() {
     if (target_) {
       delete target_;

diff --git a/ash/wm/ash_focus_rules_unittest.cc b/ash/wm/ash_focus_rules_unittest.cc
@@ -97,8 +97,6 @@ class LockScreenAshFocusRulesTest : public AshTestBase {
             Shell::Get()->session_controller()));
   }
 
-  void TearDown() override { AshTestBase::TearDown(); }
-
   aura::Window* CreateWindowInDefaultContainer() {
     return CreateWindowInContainer(kShellWindowId_DefaultContainer);
   }

diff --git a/ash/wm/window_animations_unittest.cc b/ash/wm/window_animations_unittest.cc
@@ -36,8 +36,6 @@ class WindowAnimationsTest : public AshTestBase {
     AshTestBase::SetUp();
   }
 
-  void TearDown() override { AshTestBase::TearDown(); }
-
  private:
   DISALLOW_COPY_AND_ASSIGN(WindowAnimationsTest);
 };
@@ -51,7 +49,7 @@ class MinimizeAnimationObserver : public ui::LayerAnimationObserver {
     animator_->AddObserver(this);
     // RemoveObserver is called when the first animation is scheduled and so
     // there should be no need for now to remove it in destructor.
-  };
+  }
   base::TimeDelta duration() { return duration_; }
 
  protected:

diff --git a/chromecast/browser/cast_media_blocker_unittest.cc b/chromecast/browser/cast_media_blocker_unittest.cc
@@ -67,8 +67,6 @@ class CastMediaBlockerTest : public content::RenderViewHostTestHarness {
     media_blocker_ = std::make_unique<CastMediaBlocker>(media_session_.get());
   }
 
-  void TearDown() override { content::RenderViewHostTestHarness::TearDown(); }
-
   void MediaSessionChanged(bool controllable, bool suspended) {
     media_blocker_->MediaSessionStateChanged(controllable, suspended);
   }

diff --git a/content/browser/media/session/media_session_impl_uma_unittest.cc b/content/browser/media/session/media_session_impl_uma_unittest.cc
@@ -74,8 +74,6 @@ class MediaSessionImplUmaTest : public RenderViewHostImplTestHarness {
     StartPlayer();
   }
 
-  void TearDown() override { RenderViewHostImplTestHarness::TearDown(); }
-
  protected:
   MediaSessionImpl* GetSession() { return MediaSessionImpl::Get(contents()); }
 

diff --git a/content/browser/tracing/tracing_controller_browsertest.cc b/content/browser/tracing/tracing_controller_browsertest.cc
@@ -19,7 +19,6 @@
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.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/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
@@ -128,8 +127,6 @@ class TracingControllerTest : public ContentBrowserTest {
     ContentBrowserTest::SetUp();
   }
 
-  void TearDown() override { ContentBrowserTest::TearDown(); }
-
   void Navigate(Shell* shell) {
     NavigateToURL(shell, GetTestUrl("", "title.html"));
   }

diff --git a/gpu/command_buffer/service/mailbox_manager_unittest.cc b/gpu/command_buffer/service/mailbox_manager_unittest.cc
@@ -43,8 +43,6 @@ class MailboxManagerTest : public GpuServiceTest {
     DCHECK(manager_->UsesSync());
   }
 
-  void TearDown() override { GpuServiceTest::TearDown(); }
-
   Texture* CreateTexture() {
     return new Texture(1);
   }

diff --git a/ios/chrome/browser/ui/open_in_controller_unittest.mm b/ios/chrome/browser/ui/open_in_controller_unittest.mm
@@ -38,8 +38,6 @@
             base::MakeRefCounted<network::WeakWrapperSharedURLLoaderFactory>(
                 &test_url_loader_factory_)) {}
 
-  void TearDown() override { PlatformTest::TearDown(); }
-
   void SetUp() override {
     PlatformTest::SetUp();
 

diff --git a/media/audio/audio_output_proxy_unittest.cc b/media/audio/audio_output_proxy_unittest.cc
@@ -495,8 +495,6 @@ class AudioOutputProxyTest : public testing::Test {
 
 class AudioOutputResamplerTest : public AudioOutputProxyTest {
  public:
-  void TearDown() override { AudioOutputProxyTest::TearDown(); }
-
   void InitDispatcher(base::TimeDelta close_delay) override {
     // Use a low sample rate and large buffer size when testing otherwise the
     // FakeAudioOutputStream will keep the message loop busy indefinitely; i.e.,

diff --git a/third_party/blink/renderer/core/frame/ad_tracker_test.cc b/third_party/blink/renderer/core/frame/ad_tracker_test.cc
@@ -482,8 +482,6 @@ class AdTrackerDisabledSimTest : public SimTest {
     main_resource_->Start();
   }
 
-  void TearDown() override { SimTest::TearDown(); }
-
   std::unique_ptr<SimRequest> main_resource_;
 };
 

diff --git a/third_party/blink/renderer/core/paint/compositing/composited_layer_mapping_test.cc b/third_party/blink/renderer/core/paint/compositing/composited_layer_mapping_test.cc
@@ -55,8 +55,6 @@ class CompositedLayerMappingTest : public RenderingTest {
     RenderingTest::SetUp();
     EnableCompositing();
   }
-
-  void TearDown() override { RenderingTest::TearDown(); }
 };
 
 // Tests the pre-BlinkGenPropertyTrees composited layer mapping code. With BGPT,

diff --git a/ui/wm/core/window_animations_unittest.cc b/ui/wm/core/window_animations_unittest.cc
@@ -50,8 +50,6 @@ class WindowAnimationsTest : public aura::test::AuraTestBase {
  public:
   WindowAnimationsTest() {}
 
-  void TearDown() override { AuraTestBase::TearDown(); }
-
  private:
   DISALLOW_COPY_AND_ASSIGN(WindowAnimationsTest);
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -482,8 +482,6 @@ class AdTrackerDisabledSimTest : public SimTest { @@
         main_resource_->Start();
       }
-      void TearDown() override { SimTest::TearDown(); }
       std::unique_ptr<SimRequest> main_resource_;
     };
@@ Expand Down @@