Split //ui/display and create //ui/display/manager.

ui/display/manager/chromeos/query_content_protection_task_unittest.cc

 // Copyright 2015 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/query_content_protection_task.h"
+#include "ui/display/manager/chromeos/query_content_protection_task.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/display/chromeos/display_layout_manager.h"
-#include "ui/display/chromeos/test/action_logger_util.h"
-#include "ui/display/chromeos/test/test_display_layout_manager.h"
-#include "ui/display/chromeos/test/test_native_display_delegate.h"
 #include "ui/display/fake_display_snapshot.h"
+#include "ui/display/manager/chromeos/display_layout_manager.h"
+#include "ui/display/manager/chromeos/test/action_logger_util.h"
+#include "ui/display/manager/chromeos/test/test_display_layout_manager.h"
+#include "ui/display/manager/chromeos/test/test_native_display_delegate.h"
 
 namespace ui {
 namespace test {
 
 namespace {
 
 std::unique_ptr<DisplaySnapshot> CreateDisplaySnapshot(
     int64_t id,
     DisplayConnectionType type) {
   return display::FakeDisplaySnapshot::Builder()
@@ skipping 160 matching lines @@
   EXPECT_TRUE(response_.success);
   EXPECT_EQ(static_cast<uint32_t>(DISPLAY_CONNECTION_TYPE_HDMI |
                                   DISPLAY_CONNECTION_TYPE_DVI),
             response_.link_mask);
   EXPECT_EQ(0u, response_.enabled);
   EXPECT_EQ(CONTENT_PROTECTION_METHOD_HDCP, response_.unfulfilled);
 }
 
 }  // namespace test
 }  // namespace ui