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

ui/display/chromeos/display_configurator_unittest.cc

 // Copyright 2014 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.
 
 #include "ui/display/chromeos/display_configurator.h"
 
 #include <stdint.h>
 
 #include <cmath>
 #include <cstdarg>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/format_macros.h"
 #include "base/memory/scoped_vector.h"
 #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 {
 
 namespace {
 
 // Strings returned by TestNativeDisplayDelegate::GetActionsAndClear() to
 // describe various actions that were performed.
 const char kInitXRandR[] = "init";
 const char kGrab[] = "grab";
 const char kUngrab[] = "ungrab";
@@ skipping 358 matching lines @@
       : small_mode_(gfx::Size(1366, 768), false, 60.0f),
         big_mode_(gfx::Size(2560, 1600), false, 60.0f),
         observer_(&configurator_),
         test_api_(&configurator_) {}
   virtual ~DisplayConfiguratorTest() {}
 
   virtual void SetUp() OVERRIDE {
     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_));
 
     configurator_.set_state_controller(&state_controller_);
     configurator_.set_mirroring_controller(&mirroring_controller_);
 
     std::vector<const DisplayMode*> modes;
     modes.push_back(&small_mode_);
 
     TestDisplaySnapshot* o = &outputs_[0];
@@ skipping 944 matching lines @@
                         gfx::Point(0,
                                    modes[0]->size().height() +
                                        DisplayConfigurator::kVerticalGap))
               .c_str(),
           kUngrab,
           NULL),
       log_->GetActionsAndClear());
 }
 
 }  // namespace ui