Fix namespace for src/ui/display/.

ui/display/manager/chromeos/test/test_native_display_delegate.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/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/manager/chromeos/test/action_logger.h"
 #include "ui/display/types/display_mode.h"
 #include "ui/display/types/native_display_observer.h"
 
-namespace ui {
+namespace display {
 namespace test {
 
 TestNativeDisplayDelegate::TestNativeDisplayDelegate(ActionLogger* log)
     : max_configurable_pixels_(0),
       get_hdcp_expectation_(true),
       set_hdcp_expectation_(true),
       hdcp_state_(HDCP_STATE_UNDESIRED),
       run_async_(false),
       log_(log) {}
 
@@ skipping 94 matching lines @@
 }
 
 void TestNativeDisplayDelegate::SetHDCPState(
     const DisplaySnapshot& output,
     HDCPState state,
     const SetHDCPStateCallback& callback) {
   log_->AppendAction(GetSetHDCPStateAction(output, state));
   callback.Run(set_hdcp_expectation_);
 }
 
-std::vector<ui::ColorCalibrationProfile>
+std::vector<ColorCalibrationProfile>
 TestNativeDisplayDelegate::GetAvailableColorCalibrationProfiles(
     const DisplaySnapshot& output) {
-  return std::vector<ui::ColorCalibrationProfile>();
+  return std::vector<ColorCalibrationProfile>();
 }
 
 bool TestNativeDisplayDelegate::SetColorCalibrationProfile(
     const DisplaySnapshot& output,
-    ui::ColorCalibrationProfile new_profile) {
+    ColorCalibrationProfile new_profile) {
   return false;
 }
 
 bool TestNativeDisplayDelegate::SetColorCorrection(
-    const ui::DisplaySnapshot& output,
+    const DisplaySnapshot& output,
     const std::vector<GammaRampRGBEntry>& degamma_lut,
     const std::vector<GammaRampRGBEntry>& gamma_lut,
     const std::vector<float>& correction_matrix) {
   log_->AppendAction(SetColorCorrectionAction(output, degamma_lut, gamma_lut,
                                               correction_matrix));
   return true;
 }
 
 void TestNativeDisplayDelegate::AddObserver(NativeDisplayObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void TestNativeDisplayDelegate::RemoveObserver(
     NativeDisplayObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
-display::FakeDisplayController*
-TestNativeDisplayDelegate::GetFakeDisplayController() {
+FakeDisplayController* TestNativeDisplayDelegate::GetFakeDisplayController() {
   return nullptr;
 }
 
 }  // namespace test
-}  // namespace ui
+}  // namespace display