Change single-display screens to use ScreenBase and DisplayList.

blimp/engine/app/ui/blimp_screen_unittest.cc

Index: blimp/engine/app/ui/blimp_screen_unittest.cc
diff --git a/blimp/engine/app/ui/blimp_screen_unittest.cc b/blimp/engine/app/ui/blimp_screen_unittest.cc
index b45420f10924af50ed3c3930176755f46feea0bc..dd6cc6427db3ee687279a3652fe22549f8ee8ff7 100644
--- a/blimp/engine/app/ui/blimp_screen_unittest.cc
+++ b/blimp/engine/app/ui/blimp_screen_unittest.cc
@@ -58,7 +58,8 @@ TEST_F(BlimpScreenTest, ObserversAreInfomed) {
   auto display = screen_->GetPrimaryDisplay();
   uint32_t changed_metrics =
       display::DisplayObserver::DISPLAY_METRIC_DEVICE_SCALE_FACTOR |
-      display::DisplayObserver::DISPLAY_METRIC_BOUNDS;
+      display::DisplayObserver::DISPLAY_METRIC_BOUNDS |
+      display::DisplayObserver::DISPLAY_METRIC_WORK_AREA;
 
   InSequence s;
   EXPECT_CALL(observer1_,
@@ -66,14 +67,17 @@ TEST_F(BlimpScreenTest, ObserversAreInfomed) {
   EXPECT_CALL(observer2_,
               OnDisplayMetricsChanged(EqualsDisplay(display), changed_metrics));
 
-  changed_metrics = display::DisplayObserver::DISPLAY_METRIC_BOUNDS;
+  changed_metrics = display::DisplayObserver::DISPLAY_METRIC_BOUNDS |
+                    display::DisplayObserver::DISPLAY_METRIC_WORK_AREA;
   EXPECT_CALL(observer1_,
               OnDisplayMetricsChanged(EqualsDisplay(display), changed_metrics));
   EXPECT_CALL(observer2_,
               OnDisplayMetricsChanged(EqualsDisplay(display), changed_metrics));
 
   changed_metrics =
-      display::DisplayObserver::DISPLAY_METRIC_DEVICE_SCALE_FACTOR;
+      display::DisplayObserver::DISPLAY_METRIC_DEVICE_SCALE_FACTOR |
+      display::DisplayObserver::DISPLAY_METRIC_BOUNDS |
+      display::DisplayObserver::DISPLAY_METRIC_WORK_AREA;
   EXPECT_CALL(observer1_,
               OnDisplayMetricsChanged(EqualsDisplay(display), changed_metrics));
   EXPECT_CALL(observer2_,
@@ -100,7 +104,8 @@ TEST_F(BlimpScreenTest, RemoveObserver) {
   auto display = screen_->GetPrimaryDisplay();
   uint32_t changed_metrics =
       display::DisplayObserver::DISPLAY_METRIC_DEVICE_SCALE_FACTOR |
-      display::DisplayObserver::DISPLAY_METRIC_BOUNDS;
+      display::DisplayObserver::DISPLAY_METRIC_BOUNDS |
+      display::DisplayObserver::DISPLAY_METRIC_WORK_AREA;
   EXPECT_CALL(observer1_,
               OnDisplayMetricsChanged(EqualsDisplay(display), changed_metrics));