[clang] Fix more clang plugin warnings in gmock objects
Discovered by passing "check-gmock-objects" to find-bad-plugins and fixing the fallout.
Bug: 589969
Change-Id: Ib71a23035870b3d535683ce0f93182b3446956e6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3851441
Reviewed-by: Nico Weber <[email protected]>
Owners-Override: Nico Weber <[email protected]>
Commit-Queue: Arthur Eubanks <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1038843}
diff --git a/components/embedder_support/android/util/input_stream_reader_unittest.cc b/components/embedder_support/android/util/input_stream_reader_unittest.cc
index 141cf6b0..5ec049c 100644
--- a/components/embedder_support/android/util/input_stream_reader_unittest.cc
+++ b/components/embedder_support/android/util/input_stream_reader_unittest.cc
@@ -29,7 +29,7 @@
class MockInputStream : public embedder_support::InputStream {
public:
MockInputStream() {}
- virtual ~MockInputStream() {}
+ ~MockInputStream() override {}
MOCK_CONST_METHOD1(BytesAvailable, bool(int* bytes_available));
MOCK_METHOD2(Skip, bool(int64_t n, int64_t* bytes_skipped));
diff --git a/components/exo/extended_drag_source_unittest.cc b/components/exo/extended_drag_source_unittest.cc
index f6f74bf..64dbdc1 100644
--- a/components/exo/extended_drag_source_unittest.cc
+++ b/components/exo/extended_drag_source_unittest.cc
@@ -241,7 +241,7 @@
DCHECK(!surface_window_->GetRootWindow());
surface_window_->AddObserver(this);
}
- ~WindowObserverHookChecker() {
+ ~WindowObserverHookChecker() override {
DCHECK(dragged_window_);
dragged_window_->RemoveObserver(this);
}
@@ -276,7 +276,9 @@
: surface_window_(surface_window) {
surface_window_->AddObserver(this);
}
- ~WindowObserverHookChecker2() { surface_window_->RemoveObserver(this); }
+ ~WindowObserverHookChecker2() override {
+ surface_window_->RemoveObserver(this);
+ }
MOCK_METHOD(void,
OnWindowPropertyChanged,
(aura::Window*, const void*, intptr_t),
diff --git a/components/exo/gaming_seat_unittest.cc b/components/exo/gaming_seat_unittest.cc
index e0db348..5a1b3d73 100644
--- a/components/exo/gaming_seat_unittest.cc
+++ b/components/exo/gaming_seat_unittest.cc
@@ -54,7 +54,7 @@
MOCK_METHOD(void, GamepadAdded, (Gamepad & gamepad), (override));
MOCK_METHOD(void, Die, (), ());
void OnGamingSeatDestroying(GamingSeat*) override { delete this; }
- ~MockGamingSeatDelegate() { Die(); }
+ ~MockGamingSeatDelegate() override { Die(); }
};
class GamingSeatTest : public test::ExoTestBase {
diff --git a/components/exo/pointer_unittest.cc b/components/exo/pointer_unittest.cc
index 8cd46a1..8f8f8d8 100644
--- a/components/exo/pointer_unittest.cc
+++ b/components/exo/pointer_unittest.cc
@@ -95,7 +95,7 @@
class MockRelativePointerDelegate : public RelativePointerDelegate {
public:
MockRelativePointerDelegate() = default;
- ~MockRelativePointerDelegate() = default;
+ ~MockRelativePointerDelegate() override = default;
// Overridden from RelativePointerDelegate:
MOCK_METHOD1(OnPointerDestroying, void(Pointer*));
@@ -115,7 +115,7 @@
broken_count++;
});
}
- ~MockPointerConstraintDelegate() = default;
+ ~MockPointerConstraintDelegate() override = default;
// Overridden from PointerConstraintDelegate:
MOCK_METHOD0(OnConstraintActivated, void());
diff --git a/components/exo/surface_test_util.h b/components/exo/surface_test_util.h
index 876709c..a86d348 100644
--- a/components/exo/surface_test_util.h
+++ b/components/exo/surface_test_util.h
@@ -15,7 +15,7 @@
SurfaceObserverForTest();
SurfaceObserverForTest(const SurfaceObserverForTest&) = delete;
SurfaceObserverForTest& operator=(const SurfaceObserverForTest&) = delete;
- virtual ~SurfaceObserverForTest();
+ ~SurfaceObserverForTest() override;
// SurfaceObserver overrides
void OnSurfaceDestroying(Surface* surface) override {}
diff --git a/components/exo/ui_lock_controller_unittest.cc b/components/exo/ui_lock_controller_unittest.cc
index 4101802..50dc96d 100644
--- a/components/exo/ui_lock_controller_unittest.cc
+++ b/components/exo/ui_lock_controller_unittest.cc
@@ -86,7 +86,7 @@
});
}
- ~MockPointerConstraintDelegate() {
+ ~MockPointerConstraintDelegate() override {
// Notifying destruction here removes some boilerplate from tests.
pointer_->OnPointerConstraintDelegateDestroying(this);
}
diff --git a/components/safe_browsing/ios/browser/safe_browsing_url_allow_list_unittest.mm b/components/safe_browsing/ios/browser/safe_browsing_url_allow_list_unittest.mm
index c270244..3b476c3f 100644
--- a/components/safe_browsing/ios/browser/safe_browsing_url_allow_list_unittest.mm
+++ b/components/safe_browsing/ios/browser/safe_browsing_url_allow_list_unittest.mm
@@ -38,7 +38,7 @@
class MockWebStateObserver : public web::WebStateObserver {
public:
MockWebStateObserver() {}
- ~MockWebStateObserver() {}
+ ~MockWebStateObserver() override {}
MOCK_METHOD1(DidChangeVisibleSecurityState, void(web::WebState*));
};
diff --git a/components/translate/core/browser/mock_translate_client.h b/components/translate/core/browser/mock_translate_client.h
index 3ab395a..1e67183 100644
--- a/components/translate/core/browser/mock_translate_client.h
+++ b/components/translate/core/browser/mock_translate_client.h
@@ -41,9 +41,9 @@
MOCK_METHOD0(GetAcceptLanguagesService, language::AcceptLanguagesService*());
MOCK_CONST_METHOD0(GetInfobarIconID, int());
-#if !defined(USE_AURA)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)
std::unique_ptr<infobars::InfoBar> CreateInfoBar(
- std::unique_ptr<TranslateInfoBarDelegate> delegate) const {
+ std::unique_ptr<TranslateInfoBarDelegate> delegate) const override {
return std::make_unique<infobars::InfoBar>(std::move(delegate));
}
#endif
