| Index: ui/display/manager/chromeos/test/test_native_display_delegate.cc
 | 
| diff --git a/ui/display/chromeos/test/test_native_display_delegate.cc b/ui/display/manager/chromeos/test/test_native_display_delegate.cc
 | 
| similarity index 94%
 | 
| rename from ui/display/chromeos/test/test_native_display_delegate.cc
 | 
| rename to ui/display/manager/chromeos/test/test_native_display_delegate.cc
 | 
| index 23a9e013edb0ca79856a0022bfde71a7c90d67a9..060dec2dfbfa599e82a082575e51ac14f295b957 100644
 | 
| --- a/ui/display/chromeos/test/test_native_display_delegate.cc
 | 
| +++ b/ui/display/manager/chromeos/test/test_native_display_delegate.cc
 | 
| @@ -2,13 +2,13 @@
 | 
|  // Use of this source code is governed by a BSD-style license that can be
 | 
|  // found in the LICENSE file.
 | 
|  
 | 
| -#include "ui/display/chromeos/test/test_native_display_delegate.h"
 | 
| +#include "ui/display/manager/chromeos/test/test_native_display_delegate.h"
 | 
|  
 | 
|  #include "base/bind.h"
 | 
|  #include "base/location.h"
 | 
|  #include "base/single_thread_task_runner.h"
 | 
|  #include "base/threading/thread_task_runner_handle.h"
 | 
| -#include "ui/display/chromeos/test/action_logger.h"
 | 
| +#include "ui/display/manager/chromeos/test/action_logger.h"
 | 
|  #include "ui/display/types/display_mode.h"
 | 
|  
 | 
|  namespace ui {
 | 
| @@ -20,11 +20,9 @@ TestNativeDisplayDelegate::TestNativeDisplayDelegate(ActionLogger* log)
 | 
|        set_hdcp_expectation_(true),
 | 
|        hdcp_state_(HDCP_STATE_UNDESIRED),
 | 
|        run_async_(false),
 | 
| -      log_(log) {
 | 
| -}
 | 
| +      log_(log) {}
 | 
|  
 | 
| -TestNativeDisplayDelegate::~TestNativeDisplayDelegate() {
 | 
| -}
 | 
| +TestNativeDisplayDelegate::~TestNativeDisplayDelegate() {}
 | 
|  
 | 
|  void TestNativeDisplayDelegate::Initialize() {
 | 
|    log_->AppendAction(kInitXRandR);
 | 
| @@ -146,12 +144,10 @@ bool TestNativeDisplayDelegate::SetColorCorrection(
 | 
|    return true;
 | 
|  }
 | 
|  
 | 
| -void TestNativeDisplayDelegate::AddObserver(NativeDisplayObserver* observer) {
 | 
| -}
 | 
| +void TestNativeDisplayDelegate::AddObserver(NativeDisplayObserver* observer) {}
 | 
|  
 | 
|  void TestNativeDisplayDelegate::RemoveObserver(
 | 
| -    NativeDisplayObserver* observer) {
 | 
| -}
 | 
| +    NativeDisplayObserver* observer) {}
 | 
|  
 | 
|  display::FakeDisplayController*
 | 
|  TestNativeDisplayDelegate::GetFakeDisplayController() {
 | 
| 
 |