Use white header for app windows part #2

ash/wm/custom_frame_view_ash_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/custom_frame_view_ash.h"
 
 #include "ash/test/ash_test_base.h"
 #include "base/memory/scoped_ptr.h"
 #include "grit/ash_resources.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 43 matching lines @@
   views::Widget::InitParams params;
   params.delegate = delegate;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.bounds = gfx::Rect(0, 0, 100, 100);
   params.context = CurrentContext();
   widget->Init(params);
   widget->Show();
 
   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
   // TODO(pkotwicz): Clean this test up once the separator overlays the window
   // controls.
   const int kSeparatorSize = 1;
 
   // 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());
 }
 
 }  // namespace ash