Remove DisplayState from the public interface for DisplayConfigurator

ui/display/chromeos/display_util.h

Index: ui/display/chromeos/display_util.h
diff --git a/ui/display/chromeos/display_util.h b/ui/display/chromeos/display_util.h
index 8df778d840aa02dafee44e58aaa848281504ed42..cfe6f6c7720b3c5c80a07e84ae5932a35075712e 100644
--- a/ui/display/chromeos/display_util.h
+++ b/ui/display/chromeos/display_util.h
@@ -8,11 +8,14 @@
 #include <string>
 #include <vector>
 
-#include "ui/display/chromeos/display_configurator.h"
+#include "third_party/cros_system_api/dbus/service_constants.h"
+#include "ui/display/display_export.h"
 #include "ui/display/types/display_constants.h"
 
 namespace ui {
 
+class DisplaySnapshot;
+
 // Returns a string describing |state|.
 std::string DisplayPowerStateToString(chromeos::DisplayPowerState state);
 
@@ -22,10 +25,10 @@ std::string MultipleDisplayStateToString(MultipleDisplayState state);
 // Returns the number of displays in |displays| that should be turned on, per
 // |state|.  If |display_power| is non-NULL, it is updated to contain the
 // on/off state of each corresponding entry in |displays|.
-int DISPLAY_EXPORT GetDisplayPower(
-    const std::vector<DisplayConfigurator::DisplayState>& display_states,
-    chromeos::DisplayPowerState state,
-    std::vector<bool>* display_power);
+int DISPLAY_EXPORT
+GetDisplayPower(const std::vector<DisplaySnapshot*>& displays,
+                chromeos::DisplayPowerState state,
+                std::vector<bool>* display_power);
 
 }  // namespace ui