Use white header for app windows part #2

ash/wm/custom_frame_view_ash_unittest.cc

Index: ash/wm/custom_frame_view_ash_unittest.cc
diff --git a/ash/wm/custom_frame_view_ash_unittest.cc b/ash/wm/custom_frame_view_ash_unittest.cc
index 8fa65aa504e75ac04e2fa16b4f98abd20be63489..349248a61ff26be3113e515adfb6b2a9ba024849 100644
--- a/ash/wm/custom_frame_view_ash_unittest.cc
+++ b/ash/wm/custom_frame_view_ash_unittest.cc
@@ -61,7 +61,7 @@ TEST_F(CustomFrameViewAshTest, HeaderHeight) {
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   gfx::ImageSkia* close_button =
-      rb.GetImageSkiaNamed(IDR_AURA_WINDOW_MAXIMIZED_CLOSE);
+      rb.GetImageSkiaNamed(IDR_AURA_WINDOW_CONTROL_BACKGROUND_H);
 
   // |kSeparatorSize| should match |kHeaderContentSeparatorSize| in
   // header_painter.cc
@@ -71,12 +71,13 @@ TEST_F(CustomFrameViewAshTest, HeaderHeight) {
 
   // The header should have enough room for the window controls and the
   // separator line.
-  EXPECT_EQ(close_button->height() + kSeparatorSize,
+  int expected_height = close_button->height() + kSeparatorSize;
+  EXPECT_EQ(expected_height,
             delegate->custom_frame_view()->GetHeaderView()->height());
 
+  // The header height should be valid upon maximizing the widget too.
   widget->Maximize();
-  close_button = rb.GetImageSkiaNamed(IDR_AURA_WINDOW_MAXIMIZED_CLOSE2);
-  EXPECT_EQ(close_button->height() + kSeparatorSize,
+  EXPECT_EQ(expected_height,
             delegate->custom_frame_view()->GetHeaderView()->height());
 }