| Index: ui/display/manager/chromeos/update_display_configuration_task_unittest.cc
 | 
| diff --git a/ui/display/chromeos/update_display_configuration_task_unittest.cc b/ui/display/manager/chromeos/update_display_configuration_task_unittest.cc
 | 
| similarity index 97%
 | 
| rename from ui/display/chromeos/update_display_configuration_task_unittest.cc
 | 
| rename to ui/display/manager/chromeos/update_display_configuration_task_unittest.cc
 | 
| index 9ec10438da7c4c7dc28dc99c8bfd66446c2f2bb1..5fb7dd14386192bfdfdfa4875f22e55d46fb4c8c 100644
 | 
| --- a/ui/display/chromeos/update_display_configuration_task_unittest.cc
 | 
| +++ b/ui/display/manager/chromeos/update_display_configuration_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/update_display_configuration_task.h"
 | 
| +#include "ui/display/manager/chromeos/update_display_configuration_task.h"
 | 
|  
 | 
|  #include <stddef.h>
 | 
|  
 | 
| @@ -14,10 +14,10 @@
 | 
|  #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 {
 | 
| @@ -444,7 +444,7 @@ TEST_F(UpdateDisplayConfigurationTaskTest, NoopSoftwareMirrorConfiguration) {
 | 
|    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());
 | 
|  }
 | 
|  
 | 
| @@ -478,7 +478,7 @@ TEST_F(UpdateDisplayConfigurationTaskTest,
 | 
|    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(),
 | 
| 
 |