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

ui/display/manager/chromeos/apply_content_protection_task_unittest.cc

Index: ui/display/manager/chromeos/apply_content_protection_task_unittest.cc
diff --git a/ui/display/chromeos/apply_content_protection_task_unittest.cc b/ui/display/manager/chromeos/apply_content_protection_task_unittest.cc
similarity index 91%
rename from ui/display/chromeos/apply_content_protection_task_unittest.cc
rename to ui/display/manager/chromeos/apply_content_protection_task_unittest.cc
index 595db28dde3e081134db371c769da5806e67e25c..90d47dc540d1e14d920fa021f81c15de2bd693cb 100644
--- a/ui/display/chromeos/apply_content_protection_task_unittest.cc
+++ b/ui/display/manager/chromeos/apply_content_protection_task_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/display/chromeos/apply_content_protection_task.h"
+#include "ui/display/manager/chromeos/apply_content_protection_task.h"
 
 #include <stdint.h>
 #include <utility>
@@ -10,11 +10,11 @@
 #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 {
@@ -92,7 +92,8 @@ TEST_F(ApplyContentProtectionTaskTest, ApplyWithHDMIDisplay) {
   EXPECT_EQ(SUCCESS, response_);
   EXPECT_EQ(
       JoinActions(GetSetHDCPStateAction(*layout_manager.GetDisplayStates()[0],
-                                        HDCP_STATE_DESIRED).c_str(),
+                                        HDCP_STATE_DESIRED)
+                      .c_str(),
                   NULL),
       log_.GetActionsAndClear());
 }
@@ -152,7 +153,8 @@ TEST_F(ApplyContentProtectionTaskTest, FailSettingHDCPState) {
   EXPECT_EQ(ERROR, response_);
   EXPECT_EQ(
       JoinActions(GetSetHDCPStateAction(*layout_manager.GetDisplayStates()[0],
-                                        HDCP_STATE_DESIRED).c_str(),
+                                        HDCP_STATE_DESIRED)
+                      .c_str(),
                   NULL),
       log_.GetActionsAndClear());
 }