chromeos: Makes AshTestBase/Helper target mash when appropriate

ash/test/ash_test_base.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_ASH_TEST_BASE_H_
 #define ASH_TEST_ASH_TEST_BASE_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/display/display.h"
 #include "ui/wm/public/window_types.h"
 
 namespace aura {
 class Window;
 class WindowDelegate;
 }  // namespace aura
 
 namespace display {
+class Display;
 class DisplayManager;
 
 namespace test {
 class DisplayManagerTestApi;
 }  // namespace test
 }  // namespace display
 
 namespace gfx {
 class Rect;
 }
@@ skipping 124 matching lines @@
   // Methods to emulate blocking and unblocking user session with given
   // |block_reason|.
   void BlockUserSession(UserSessionBlockReason block_reason);
   void UnblockUserSession();
 
   void DisableIME();
 
   // Swap the primary display with the secondary.
   void SwapPrimaryDisplay();
 
+  display::Display GetSecondaryDisplay();
+
  private:
   friend class ash::AshTestImplAura;
 
   bool setup_called_;
   bool teardown_called_;
   // |SetUp()| doesn't activate session if this is set to false.
   bool start_session_;
   std::unique_ptr<AshTestEnvironment> ash_test_environment_;
   std::unique_ptr<AshTestHelper> ash_test_helper_;
   std::unique_ptr<ui::test::EventGenerator> event_generator_;
 
   DISALLOW_COPY_AND_ASSIGN(AshTestBase);
 };
 
 class NoSessionAshTestBase : public AshTestBase {
  public:
   NoSessionAshTestBase() { set_start_session(false); }
   ~NoSessionAshTestBase() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NoSessionAshTestBase);
 };
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_TEST_ASH_TEST_BASE_H_