Commit 079fcae5 authored by Mark Yacoub's avatar Mark Yacoub Committed by Commit Bot

Ozone: Clang format tests

Use std::make_unique instead unique_ptr(new).
Use '= default' to define a trivial default constructor.

BUG=1082882
TEST=drm_overlay_validator_unittest,drm_window_unittest,screen_manager_unittest.

Change-Id: I6ee0b6ff923d7134348d2a6d103c1acae48da9fc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2352850
Auto-Submit: Mark Yacoub <markyacoub@google.com>
Reviewed-by: default avatarDaniel Nicoara <dnicoara@chromium.org>
Reviewed-by: default avatarMark Yacoub <markyacoub@google.com>
Commit-Queue: Mark Yacoub <markyacoub@google.com>
Cr-Commit-Position: refs/heads/master@{#797305}
parent 75253f16
...@@ -416,9 +416,8 @@ TEST_F(DrmOverlayValidatorTest, ...@@ -416,9 +416,8 @@ TEST_F(DrmOverlayValidatorTest,
InitDrmStatesAndControllers(crtc_states); InitDrmStatesAndControllers(crtc_states);
ui::HardwareDisplayController* controller = window_->GetController(); ui::HardwareDisplayController* controller = window_->GetController();
controller->AddCrtc( controller->AddCrtc(std::make_unique<ui::CrtcController>(
std::unique_ptr<ui::CrtcController>(new ui::CrtcController( drm_.get(), kCrtcIdBase + 1, kConnectorIdBase + 1));
drm_.get(), kCrtcIdBase + 1, kConnectorIdBase + 1)));
ui::DrmOverlayPlane plane1(CreateBuffer(), nullptr); ui::DrmOverlayPlane plane1(CreateBuffer(), nullptr);
EXPECT_TRUE(controller->Modeset(plane1, kDefaultMode)); EXPECT_TRUE(controller->Modeset(plane1, kDefaultMode));
...@@ -462,9 +461,8 @@ TEST_F(DrmOverlayValidatorTest, ...@@ -462,9 +461,8 @@ TEST_F(DrmOverlayValidatorTest,
InitDrmStatesAndControllers(crtc_states); InitDrmStatesAndControllers(crtc_states);
ui::HardwareDisplayController* controller = window_->GetController(); ui::HardwareDisplayController* controller = window_->GetController();
controller->AddCrtc( controller->AddCrtc(std::make_unique<ui::CrtcController>(
std::unique_ptr<ui::CrtcController>(new ui::CrtcController( drm_.get(), kCrtcIdBase + 1, kConnectorIdBase + 1));
drm_.get(), kCrtcIdBase + 1, kConnectorIdBase + 1)));
ui::DrmOverlayPlane plane1(CreateBuffer(), nullptr); ui::DrmOverlayPlane plane1(CreateBuffer(), nullptr);
EXPECT_TRUE(controller->Modeset(plane1, kDefaultMode)); EXPECT_TRUE(controller->Modeset(plane1, kDefaultMode));
...@@ -505,9 +503,8 @@ TEST_F(DrmOverlayValidatorTest, ...@@ -505,9 +503,8 @@ TEST_F(DrmOverlayValidatorTest,
InitDrmStatesAndControllers(crtc_states); InitDrmStatesAndControllers(crtc_states);
ui::HardwareDisplayController* controller = window_->GetController(); ui::HardwareDisplayController* controller = window_->GetController();
controller->AddCrtc( controller->AddCrtc(std::make_unique<ui::CrtcController>(
std::unique_ptr<ui::CrtcController>(new ui::CrtcController( drm_.get(), kCrtcIdBase + 1, kConnectorIdBase + 1));
drm_.get(), kCrtcIdBase + 1, kConnectorIdBase + 1)));
ui::DrmOverlayPlane plane1(CreateBuffer(), nullptr); ui::DrmOverlayPlane plane1(CreateBuffer(), nullptr);
EXPECT_TRUE(controller->Modeset(plane1, kDefaultMode)); EXPECT_TRUE(controller->Modeset(plane1, kDefaultMode));
...@@ -548,9 +545,8 @@ TEST_F(DrmOverlayValidatorTest, OptimalFormatXRGB_MirroredControllers) { ...@@ -548,9 +545,8 @@ TEST_F(DrmOverlayValidatorTest, OptimalFormatXRGB_MirroredControllers) {
InitDrmStatesAndControllers(crtc_states); InitDrmStatesAndControllers(crtc_states);
ui::HardwareDisplayController* controller = window_->GetController(); ui::HardwareDisplayController* controller = window_->GetController();
controller->AddCrtc( controller->AddCrtc(std::make_unique<ui::CrtcController>(
std::unique_ptr<ui::CrtcController>(new ui::CrtcController( drm_.get(), kCrtcIdBase + 1, kConnectorIdBase + 1));
drm_.get(), kCrtcIdBase + 1, kConnectorIdBase + 1)));
ui::DrmOverlayPlane plane1(CreateBuffer(), nullptr); ui::DrmOverlayPlane plane1(CreateBuffer(), nullptr);
EXPECT_TRUE(controller->Modeset(plane1, kDefaultMode)); EXPECT_TRUE(controller->Modeset(plane1, kDefaultMode));
...@@ -585,9 +581,8 @@ TEST_F(DrmOverlayValidatorTest, ...@@ -585,9 +581,8 @@ TEST_F(DrmOverlayValidatorTest,
InitDrmStatesAndControllers(crtc_states); InitDrmStatesAndControllers(crtc_states);
ui::HardwareDisplayController* controller = window_->GetController(); ui::HardwareDisplayController* controller = window_->GetController();
controller->AddCrtc( controller->AddCrtc(std::make_unique<ui::CrtcController>(
std::unique_ptr<ui::CrtcController>(new ui::CrtcController( drm_.get(), kCrtcIdBase + 1, kConnectorIdBase + 1));
drm_.get(), kCrtcIdBase + 1, kConnectorIdBase + 1)));
ui::DrmOverlayPlane plane1(CreateBuffer(), nullptr); ui::DrmOverlayPlane plane1(CreateBuffer(), nullptr);
EXPECT_TRUE(controller->Modeset(plane1, kDefaultMode)); EXPECT_TRUE(controller->Modeset(plane1, kDefaultMode));
...@@ -621,9 +616,8 @@ TEST_F(DrmOverlayValidatorTest, ...@@ -621,9 +616,8 @@ TEST_F(DrmOverlayValidatorTest,
InitDrmStatesAndControllers(crtc_states); InitDrmStatesAndControllers(crtc_states);
ui::HardwareDisplayController* controller = window_->GetController(); ui::HardwareDisplayController* controller = window_->GetController();
controller->AddCrtc( controller->AddCrtc(std::make_unique<ui::CrtcController>(
std::unique_ptr<ui::CrtcController>(new ui::CrtcController( drm_.get(), kCrtcIdBase + 1, kConnectorIdBase + 1));
drm_.get(), kCrtcIdBase + 1, kConnectorIdBase + 1)));
ui::DrmOverlayPlane plane1(CreateBuffer(), nullptr); ui::DrmOverlayPlane plane1(CreateBuffer(), nullptr);
EXPECT_TRUE(controller->Modeset(plane1, kDefaultMode)); EXPECT_TRUE(controller->Modeset(plane1, kDefaultMode));
......
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
namespace { namespace {
// Mode of size 6x4. // Mode of size 6x4.
const drmModeModeInfo kDefaultMode = const drmModeModeInfo kDefaultMode = {0, 6, 0, 0, 0, 0, 4, 0,
{0, 6, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, {'\0'}}; 0, 0, 0, 0, 0, 0, {'\0'}};
const gfx::AcceleratedWidget kDefaultWidgetHandle = 1; const gfx::AcceleratedWidget kDefaultWidgetHandle = 1;
const uint32_t kDefaultCrtc = 1; const uint32_t kDefaultCrtc = 1;
...@@ -68,7 +68,7 @@ SkBitmap AllocateBitmap(const gfx::Size& size) { ...@@ -68,7 +68,7 @@ SkBitmap AllocateBitmap(const gfx::Size& size) {
class DrmWindowTest : public testing::Test { class DrmWindowTest : public testing::Test {
public: public:
DrmWindowTest() {} DrmWindowTest() = default;
void SetUp() override; void SetUp() override;
void TearDown() override; void TearDown() override;
......
...@@ -44,8 +44,8 @@ drmModeModeInfo Mode(uint16_t hdisplay, uint16_t vdisplay) { ...@@ -44,8 +44,8 @@ drmModeModeInfo Mode(uint16_t hdisplay, uint16_t vdisplay) {
class ScreenManagerTest : public testing::Test { class ScreenManagerTest : public testing::Test {
public: public:
ScreenManagerTest() {} ScreenManagerTest() = default;
~ScreenManagerTest() override {} ~ScreenManagerTest() override = default;
gfx::Rect GetPrimaryBounds() const { gfx::Rect GetPrimaryBounds() const {
return gfx::Rect(0, 0, kDefaultMode.hdisplay, kDefaultMode.vdisplay); return gfx::Rect(0, 0, kDefaultMode.hdisplay, kDefaultMode.vdisplay);
......
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