[Refactor] Cache the views::Widget* that the FrameMaximizeButton acts on

ash/wm/frame_painter_unittest.cc

 // Copyright (c) 2012 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/frame_painter.h"
 
 #include "ash/ash_constants.h"
 #include "ash/root_window_settings.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 101 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ScopedOpacityConstantModifier);
 };
 
 // Creates a new FramePainter with empty buttons. Caller owns the memory.
 FramePainter* CreateTestPainter(Widget* widget) {
   FramePainter* painter = new FramePainter();
   NonClientFrameView* frame_view = widget->non_client_view()->frame_view();
   ash::FrameCaptionButtonContainerView* container =
       new ash::FrameCaptionButtonContainerView(
-          frame_view,
           widget,
           ash::FrameCaptionButtonContainerView::MINIMIZE_ALLOWED);
   // Add the container to the widget's non-client frame view so that it will be
   // deleted when the widget is destroyed.
   frame_view->AddChildView(container);
   painter->Init(widget, NULL, container);
   return painter;
 }
 
 // Self-owned manager of the frame painter which deletes the painter and itself
@@ skipping 436 matching lines @@
 
   wm::GetWindowSettings(w->GetNativeWindow())->SetTrackedByWorkspace(false);
   EXPECT_FALSE(p->ShouldUseMinimalHeaderStyle(FramePainter::THEMED_NO));
   wm::GetWindowSettings(w->GetNativeWindow())->SetTrackedByWorkspace(true);
 }
 
 // Ensure the title text is vertically aligned with the window icon.
 TEST_F(FramePainterTest, TitleIconAlignment) {
   scoped_ptr<Widget> w(CreateTestWidget());
   FramePainter p;
-  ash::FrameCaptionButtonContainerView container(NULL, w.get(),
+  ash::FrameCaptionButtonContainerView container(w.get(),
       ash::FrameCaptionButtonContainerView::MINIMIZE_ALLOWED);
   views::View window_icon;
   window_icon.SetBounds(0, 0, 16, 16);
   p.Init(w.get(), &window_icon, &container);
   w->SetBounds(gfx::Rect(0, 0, 500, 500));
   w->Show();
 
   // Title and icon are aligned when shorter_header is false.
   p.LayoutHeader(w->non_client_view()->frame_view(), false);
   gfx::Font default_font;
@@ skipping 64 matching lines @@
   FramePainterOwner* o2 = new FramePainterOwner(w2);
   FramePainter* p2 = o2->frame_painter();
   w2->Show();
   EXPECT_FALSE(p1->UseSoloWindowHeader());
   EXPECT_FALSE(p2->UseSoloWindowHeader());
 
   // Exit with no resource release. They'll be released at shutdown.
 }
 
 }  // namespace ash