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

ash/test/test_shell_delegate.h

 // 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.
 
 #ifndef ASH_TEST_TEST_SHELL_DELEGATE_H_
 #define ASH_TEST_TEST_SHELL_DELEGATE_H_
 
 #include "ash/shell_delegate.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 39 matching lines @@
   virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;
   virtual void OpenFeedbackPage() OVERRIDE;
   virtual void RecordUserMetricsAction(UserMetricsAction action) OVERRIDE;
   virtual void HandleMediaNextTrack() OVERRIDE;
   virtual void HandleMediaPlayPause() OVERRIDE;
   virtual void HandleMediaPrevTrack() OVERRIDE;
   virtual string16 GetTimeRemainingString(base::TimeDelta delta) OVERRIDE;
   virtual void SaveScreenMagnifierScale(double scale) OVERRIDE;
   virtual double GetSavedScreenMagnifierScale() OVERRIDE;
   virtual ui::MenuModel* CreateContextMenu(aura::RootWindow* root) OVERRIDE;
+  virtual aura::client::StackingClient* CreateStackingClient() OVERRIDE;
 
   int num_exit_requests() const { return num_exit_requests_; }
  private:
   friend class ash::test::AshTestBase;
 
   // Given |session_started| will update internal state.
   // If |session_started| is true this method will also set
   // |user_logged_in_| to true.
   // When session is started it always means that user has logged in.
   // Possible situation is that user has already logged in but session has not
@@ skipping 14 matching lines @@
 
   scoped_ptr<content::BrowserContext> current_browser_context_;
 
   DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);
 };
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_TEST_TEST_SHELL_DELEGATE_H_