Split ui/display types into separate module and have Ozone depend on it

ui/display/chromeos/display_configurator_unittest.cc

Index: ui/display/chromeos/display_configurator_unittest.cc
diff --git a/ui/display/chromeos/display_configurator_unittest.cc b/ui/display/chromeos/display_configurator_unittest.cc
index f7b1182cb36a09211091886ddf6b5a83361a3be1..1790d669779785e6ab4e18e35d27f9a003d615e5 100644
--- a/ui/display/chromeos/display_configurator_unittest.cc
+++ b/ui/display/chromeos/display_configurator_unittest.cc
@@ -18,9 +18,9 @@
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/display/chromeos/display_mode.h"
-#include "ui/display/chromeos/native_display_delegate.h"
 #include "ui/display/chromeos/test/test_display_snapshot.h"
+#include "ui/display/types/chromeos/display_mode.h"
+#include "ui/display/types/chromeos/native_display_delegate.h"
 
 namespace ui {
 
@@ -399,11 +399,9 @@ class DisplayConfiguratorTest : public testing::Test {
     log_.reset(new ActionLogger());
 
     native_display_delegate_ = new TestNativeDisplayDelegate(log_.get());
-    configurator_.SetNativeDisplayDelegateForTesting(
-        scoped_ptr<NativeDisplayDelegate>(native_display_delegate_));
-
     touchscreen_delegate_ = new TestTouchscreenDelegate(log_.get());
-    configurator_.SetTouchscreenDelegateForTesting(
+    configurator_.SetDelegatesForTesting(
+        scoped_ptr<NativeDisplayDelegate>(native_display_delegate_),
         scoped_ptr<DisplayConfigurator::TouchscreenDelegate>(
             touchscreen_delegate_));