[Refactor] Move code for painting the window header for browser windows out of ash

chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc

Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc
index 961cc34a6161af38635e4ebfde3e7b25f39b99b2..9f3fcdab4baa5e9bb64525e0a70f7139688b2016 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc
@@ -118,7 +118,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNonClientFrameViewAshTest, ImmersiveFullscreen) {
   // Frame paints by default.
   EXPECT_TRUE(frame_view->ShouldPaint());
   EXPECT_LT(Tab::GetImmersiveHeight(),
-            frame_view->header_painter_->header_height());
+            frame_view->header_painter_->GetHeaderHeightForPainting());
 
   // Enter both browser fullscreen and tab fullscreen. Entering browser
   // fullscreen should enable immersive fullscreen.
@@ -152,7 +152,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNonClientFrameViewAshTest, ImmersiveFullscreen) {
   revealed_lock.reset();
   EXPECT_FALSE(immersive_mode_controller->IsRevealed());
   EXPECT_FALSE(frame_view->ShouldPaint());
-  EXPECT_EQ(0, frame_view->header_painter_->header_height());
+  EXPECT_EQ(0, frame_view->header_painter_->GetHeaderHeightForPainting());
 
   // Repeat test but without tab fullscreen. The tab lightbars should now show
   // when the top-of-window views are not revealed.
@@ -172,7 +172,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNonClientFrameViewAshTest, ImmersiveFullscreen) {
   EXPECT_TRUE(frame_view->caption_button_container_->visible());
   EXPECT_FALSE(frame_view->UseImmersiveLightbarHeaderStyle());
   EXPECT_LT(Tab::GetImmersiveHeight(),
-            frame_view->header_painter_->header_height());
+            frame_view->header_painter_->GetHeaderHeightForPainting());
 
   // Ending the reveal should hide the caption buttons and the header should
   // be in the lightbar style.
@@ -181,7 +181,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNonClientFrameViewAshTest, ImmersiveFullscreen) {
   EXPECT_FALSE(frame_view->caption_button_container_->visible());
   EXPECT_TRUE(frame_view->UseImmersiveLightbarHeaderStyle());
   EXPECT_EQ(Tab::GetImmersiveHeight(),
-            frame_view->header_painter_->header_height());
+            frame_view->header_painter_->GetHeaderHeightForPainting());
 
   // Exiting immersive fullscreen should make the caption buttons and the frame
   // visible again.
@@ -196,6 +196,6 @@ IN_PROC_BROWSER_TEST_F(BrowserNonClientFrameViewAshTest, ImmersiveFullscreen) {
   EXPECT_TRUE(frame_view->caption_button_container_->visible());
   EXPECT_FALSE(frame_view->UseImmersiveLightbarHeaderStyle());
   EXPECT_LT(Tab::GetImmersiveHeight(),
-            frame_view->header_painter_->header_height());
+            frame_view->header_painter_->GetHeaderHeightForPainting());
 }
 #endif  // defined(OS_CHROMEOS)