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

ui/display/manager/chromeos/update_display_configuration_task_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/update_display_configuration_task.h"
+#include "ui/display/manager/chromeos/update_display_configuration_task.h"
 
 #include <stddef.h>
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.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_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_native_display_delegate.h"
 
 namespace ui {
 namespace test {
 
 namespace {
 
 class TestSoftwareMirroringController
     : public DisplayConfigurator::SoftwareMirroringController {
  public:
   TestSoftwareMirroringController() : is_enabled_(false) {}
@@ skipping 406 matching lines @@
         &delegate_, &layout_manager_, MULTIPLE_DISPLAY_STATE_DUAL_MIRROR,
         chromeos::DISPLAY_POWER_ALL_ON, 0, 0, false,
         base::Bind(&UpdateDisplayConfigurationTaskTest::ResponseCallback,
                    base::Unretained(this)));
     task.Run();
   }
 
   EXPECT_TRUE(configuration_status_);
   EXPECT_EQ(MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED, display_state_);
   EXPECT_TRUE(layout_manager_.GetSoftwareMirroringController()
-              ->SoftwareMirroringEnabled());
+                  ->SoftwareMirroringEnabled());
   EXPECT_EQ(JoinActions(kGrab, kUngrab, nullptr), log_.GetActionsAndClear());
 }
 
 TEST_F(UpdateDisplayConfigurationTaskTest,
        ForceConfigurationWhileGoingToSoftwareMirror) {
   layout_manager_.set_should_mirror(false);
   layout_manager_.set_software_mirroring_controller(
       base::MakeUnique<TestSoftwareMirroringController>());
   UpdateDisplays(2);
 
@@ skipping 13 matching lines @@
         &delegate_, &layout_manager_, MULTIPLE_DISPLAY_STATE_DUAL_MIRROR,
         chromeos::DISPLAY_POWER_ALL_ON, 0, 0, true /* force_configure */,
         base::Bind(&UpdateDisplayConfigurationTaskTest::ResponseCallback,
                    base::Unretained(this)));
     task.Run();
   }
 
   EXPECT_TRUE(configuration_status_);
   EXPECT_EQ(MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED, display_state_);
   EXPECT_TRUE(layout_manager_.GetSoftwareMirroringController()
-              ->SoftwareMirroringEnabled());
+                  ->SoftwareMirroringEnabled());
   EXPECT_EQ(
       JoinActions(
           kGrab, GetFramebufferAction(gfx::Size(big_mode_.size().width(),
                                                 small_mode_.size().height() +
                                                     big_mode_.size().height()),
                                       displays_[0].get(), displays_[1].get())
                      .c_str(),
           GetCrtcAction(*displays_[0], &small_mode_, gfx::Point()).c_str(),
           GetCrtcAction(*displays_[1], &big_mode_,
                         gfx::Point(0, small_mode_.size().height()))
               .c_str(),
           kUngrab, nullptr),
       log_.GetActionsAndClear());
 }
 
 }  // namespace test
 }  // namespace ui