Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(69)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/display/display_change_observer_chromeos_unittest.cc

Issue 2257763002: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/wm/overview/scoped_transform_overview_window.cc ('k') | ash/display/display_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_change_observer_chromeos_unittest.cc
diff --git a/ash/display/display_change_observer_chromeos_unittest.cc b/ash/display/display_change_observer_chromeos_unittest.cc
index 4f0fdcb1195a72c05bb25a40988c261af1a64a22..a0f542cc0997409ac25df25c77487acf2cb96d7f 100644
--- a/ash/display/display_change_observer_chromeos_unittest.cc
+++ b/ash/display/display_change_observer_chromeos_unittest.cc
@@ -20,39 +20,39 @@ namespace ash {
TEST_F(DisplayChangeObserverTest, GetExternalDisplayModeList) {
std::vector<std::unique_ptr<const ui::DisplayMode>> modes;
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(1920, 1200), false, 60)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(1920, 1200), false, 60));
// All non-interlaced (as would be seen with different refresh rates).
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(1920, 1080), false, 80)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(1920, 1080), false, 80));
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(1920, 1080), false, 70)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(1920, 1080), false, 70));
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(1920, 1080), false, 60)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(1920, 1080), false, 60));
// Interlaced vs non-interlaced.
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(1280, 720), true, 60)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(1280, 720), true, 60));
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(1280, 720), false, 60)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(1280, 720), false, 60));
// Interlaced only.
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(1024, 768), true, 70)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(1024, 768), true, 70));
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(1024, 768), true, 60)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(1024, 768), true, 60));
// Mixed.
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(1024, 600), true, 60)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(1024, 600), true, 60));
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(1024, 600), false, 70)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(1024, 600), false, 70));
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(1024, 600), false, 60)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(1024, 600), false, 60));
// Just one interlaced mode.
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(640, 480), true, 60)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(640, 480), true, 60));
ui::TestDisplaySnapshot display_snapshot;
display_snapshot.set_modes(std::move(modes));
@@ -97,15 +97,15 @@ TEST_F(DisplayChangeObserverTest, GetInternalDisplayModeList) {
std::vector<std::unique_ptr<const ui::DisplayMode>> modes;
// Data picked from peppy.
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(1366, 768), false, 60)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(1366, 768), false, 60));
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(1024, 768), false, 60)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(1024, 768), false, 60));
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(800, 600), false, 60)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(800, 600), false, 60));
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(600, 600), false, 56.2)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(600, 600), false, 56.2));
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(640, 480), false, 59.9)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(640, 480), false, 59.9));
ui::TestDisplaySnapshot display_snapshot;
display_snapshot.set_native_mode(modes[0].get());
@@ -147,11 +147,11 @@ TEST_F(DisplayChangeObserverTest, GetInternalHiDPIDisplayModeList) {
std::vector<std::unique_ptr<const ui::DisplayMode>> modes;
// Data picked from peppy.
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(2560, 1700), false, 60)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(2560, 1700), false, 60));
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(2048, 1536), false, 60)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(2048, 1536), false, 60));
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(1920, 1440), false, 60)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(1920, 1440), false, 60));
ui::TestDisplaySnapshot display_snapshot;
display_snapshot.set_native_mode(modes[0].get());
@@ -209,7 +209,7 @@ TEST_F(DisplayChangeObserverTest, GetInternalDisplayModeList1_25) {
std::vector<std::unique_ptr<const ui::DisplayMode>> modes;
// Data picked from peppy.
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(1920, 1080), false, 60)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(1920, 1080), false, 60));
ui::TestDisplaySnapshot display_snapshot;
display_snapshot.set_native_mode(modes[0].get());
@@ -251,41 +251,41 @@ TEST_F(DisplayChangeObserverTest, GetInternalDisplayModeList1_25) {
TEST_F(DisplayChangeObserverTest, GetExternalDisplayModeList4K) {
std::vector<std::unique_ptr<const ui::DisplayMode>> modes;
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(3840, 2160), false, 30)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(3840, 2160), false, 30));
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(1920, 1200), false, 60)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(1920, 1200), false, 60));
// All non-interlaced (as would be seen with different refresh rates).
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(1920, 1080), false, 80)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(1920, 1080), false, 80));
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(1920, 1080), false, 70)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(1920, 1080), false, 70));
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(1920, 1080), false, 60)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(1920, 1080), false, 60));
// Interlaced vs non-interlaced.
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(1280, 720), true, 60)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(1280, 720), true, 60));
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(1280, 720), false, 60)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(1280, 720), false, 60));
// Interlaced only.
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(1024, 768), true, 70)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(1024, 768), true, 70));
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(1024, 768), true, 60)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(1024, 768), true, 60));
// Mixed.
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(1024, 600), true, 60)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(1024, 600), true, 60));
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(1024, 600), false, 70)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(1024, 600), false, 70));
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(1024, 600), false, 60)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(1024, 600), false, 60));
// Just one interlaced mode.
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(640, 480), true, 60)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(640, 480), true, 60));
ui::TestDisplaySnapshot display_snapshot;
display_snapshot.set_native_mode(modes[0].get());
@@ -393,9 +393,9 @@ TEST_F(DisplayChangeObserverTest,
FindExternalDisplayNativeModeWhenOverwritten) {
std::vector<std::unique_ptr<const ui::DisplayMode>> modes;
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(1920, 1080), true, 60)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(1920, 1080), true, 60));
modes.push_back(
- base::WrapUnique(new ui::DisplayMode(gfx::Size(1920, 1080), false, 60)));
+ base::MakeUnique<ui::DisplayMode>(gfx::Size(1920, 1080), false, 60));
ui::TestDisplaySnapshot display_snapshot;
display_snapshot.set_native_mode(modes[0].get());
« no previous file with comments | « ash/common/wm/overview/scoped_transform_overview_window.cc ('k') | ash/display/display_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698