From 5b1a23541fa0f96ea5c13df556e8661bbea85903 Mon Sep 17 00:00:00 2001 From: "robert.bradford" Date: Thu, 5 Nov 2015 07:51:31 -0800 Subject: ash: Add unit testing coverage of DisplayColorManager As part of the effort to enable more advanced display color management this CL introduces testing of the existing VCGT support. The .icc files included here were copied from ChromeOS: http://crrev.com/48950c9cb35671c59f9f63316683357c8792b79d BUG=495196 TEST=ash_unittests:DisplayColorManagerTest Review URL: https://codereview.chromium.org/1430633003 Cr-Commit-Position: refs/heads/master@{#358061} --- ui/display/chromeos/test/test_display_snapshot.cc | 5 ++++- ui/display/chromeos/test/test_display_snapshot.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'ui') diff --git a/ui/display/chromeos/test/test_display_snapshot.cc b/ui/display/chromeos/test/test_display_snapshot.cc index 227e6f4..41da246 100644 --- a/ui/display/chromeos/test/test_display_snapshot.cc +++ b/ui/display/chromeos/test/test_display_snapshot.cc @@ -23,6 +23,7 @@ TestDisplaySnapshot::TestDisplaySnapshot( const gfx::Size& physical_size, DisplayConnectionType type, bool is_aspect_preserving_scaling, + int64_t product_id, const std::vector& modes, const DisplayMode* current_mode, const DisplayMode* native_mode) @@ -35,7 +36,9 @@ TestDisplaySnapshot::TestDisplaySnapshot( std::string(), modes, current_mode, - native_mode) {} + native_mode) { + product_id_ = product_id; +} TestDisplaySnapshot::~TestDisplaySnapshot() {} diff --git a/ui/display/chromeos/test/test_display_snapshot.h b/ui/display/chromeos/test/test_display_snapshot.h index b5b5cac..77bdc84 100644 --- a/ui/display/chromeos/test/test_display_snapshot.h +++ b/ui/display/chromeos/test/test_display_snapshot.h @@ -18,6 +18,7 @@ class DISPLAY_EXPORT TestDisplaySnapshot : public DisplaySnapshot { const gfx::Size& physical_size, DisplayConnectionType type, bool is_aspect_preserving_scaling, + int64_t product_id, const std::vector& modes, const DisplayMode* current_mode, const DisplayMode* native_mode); -- cgit v1.1