Fix CustomFrameViewAshTest.ResizeButtonToggleMaximize frame creation.

ash/wm/custom_frame_view_ash_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/custom_frame_view_ash.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/maximize_bubble_controller.h"
 #include "ash/wm/property_util.h"
@@ skipping 50 matching lines @@
 };
 
 class ShellViewsDelegate : public views::TestViewsDelegate {
  public:
   ShellViewsDelegate() {}
   virtual ~ShellViewsDelegate() {}
 
   // Overridden from views::TestViewsDelegate:
   virtual views::NonClientFrameView* CreateDefaultNonClientFrameView(
       views::Widget* widget) OVERRIDE {
-    return ash::Shell::GetInstance()->CreateDefaultNonClientFrameView(widget);
+    // Always test CustomFrameViewAsh, which may not be the ash::Shell default.
+    CustomFrameViewAsh* frame_view = new CustomFrameViewAsh;
+    frame_view->Init(widget);
+    return frame_view;
   }
   virtual bool UseTransparentWindows() const OVERRIDE {
     // Ash uses transparent window frames.
     return true;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShellViewsDelegate);
 };
 
@@ skipping 777 matching lines @@
 
   // Check that there was no size change.
   EXPECT_EQ(widget->GetWindowBoundsInScreen().size().ToString(),
             window_position.size().ToString());
   // Check that there is no phantom window left open.
   EXPECT_FALSE(maximize_button->phantom_window_open());
 }
 
 }  // namespace internal
 }  // namespace ash