Separate ash::test::DisplayManagerTestApi from ash

ash/display/display_manager.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_DISPLAY_DISPLAY_MANAGER_H_
 #define ASH_DISPLAY_DISPLAY_MANAGER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 25 matching lines @@
 
 namespace gfx {
 class Insets;
 class Rect;
 }
 
 namespace ash {
 using DisplayInfoList = std::vector<display::ManagedDisplayInfo>;
 
 namespace test {
-class AshTestBase;
 class DisplayManagerTestApi;
 }
 
 // DisplayManager maintains the current display configurations,
 // and notifies observers when configuration changes.
 //
 // TODO(oshima): Make this non internal.
 class ASH_EXPORT DisplayManager
 #if defined(OS_CHROMEOS)
     : public ui::DisplayConfigurator::SoftwareMirroringController
@@ skipping 284 matching lines @@
 
   // Notifies observers of display configuration changes.
   void NotifyMetricsChanged(const display::Display& display, uint32_t metrics);
   void NotifyDisplayAdded(const display::Display& display);
   void NotifyDisplayRemoved(const display::Display& display);
 
   // Delegated from the Screen implementation.
   void AddObserver(display::DisplayObserver* observer);
   void RemoveObserver(display::DisplayObserver* observer);
 
+  // Returns a display::Display object for a secondary display if it exists
+  // or returns invalid display if there is no secondary display.
+  const display::Display& GetSecondaryDisplay() const;

[oshima, 2016/10/04 00:47:16]

just fyi: "swap display" is a legacy feature we added long time ago before
adding multi display, to allow switching which display to use. We probably
should remove it at some point.

[rjkroege, 2016/10/05 00:21:45]

I added a TODO.

+
  private:
-  FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, ConvertPoint);
-  FRIEND_TEST_ALL_PREFIXES(DisplayManagerTest, TestNativeDisplaysChanged);
-  FRIEND_TEST_ALL_PREFIXES(DisplayManagerTest,
-                           NativeDisplaysChangedAfterPrimaryChange);
-  FRIEND_TEST_ALL_PREFIXES(DisplayManagerTest, AutomaticOverscanInsets);
-  FRIEND_TEST_ALL_PREFIXES(DisplayManagerTest, Rotate);
-  friend class DisplayManagerTest;
-  friend class test::AshTestBase;
   friend class test::DisplayManagerTestApi;
 
   bool software_mirroring_enabled() const {
     return multi_display_mode_ == MIRRORING;
   };
 
   void set_change_display_upon_host_resize(bool value) {
     change_display_upon_host_resize_ = value;
   }
 
@@ skipping 107 matching lines @@
   base::ObserverList<display::DisplayObserver> observers_;
 
   base::WeakPtrFactory<DisplayManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_DISPLAY_MANAGER_H_