re-re-land of https://codereview.chromium.org/11364053/

ash/test/test_shell_delegate.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/test/test_shell_delegate.h"
 
 #include <algorithm>
 
 #include "ash/caps_lock_delegate_stub.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/test_launcher_delegate.h"
+#include "ash/wm/stacking_controller.h"
 #include "ash/wm/window_util.h"
 #include "content/public/test/test_browser_context.h"
 #include "ui/aura/window.h"
 
 namespace ash {
 namespace test {
 
 TestShellDelegate::TestShellDelegate()
     : locked_(false),
       session_started_(true),
@@ skipping 131 matching lines @@
 }
 
 ui::MenuModel* TestShellDelegate::CreateContextMenu(aura::RootWindow* root) {
   return NULL;
 }
 
 double TestShellDelegate::GetSavedScreenMagnifierScale() {
   return std::numeric_limits<double>::min();
 }
 
+aura::client::StackingClient* TestShellDelegate::CreateStackingClient() {
+  return new StackingController;
+}
+
 void TestShellDelegate::SetSessionStarted(bool session_started) {
   session_started_ = session_started;
   if (session_started)
     user_logged_in_ = true;
 }
 
 void TestShellDelegate::SetUserLoggedIn(bool user_logged_in) {
   user_logged_in_ = user_logged_in;
   if (!user_logged_in)
     session_started_ = false;
 }
 
 }  // namespace test
 }  // namespace ash