Renamed OutputConfigurator to DisplayConfigurator

ash/display/display_change_observer_chromeos_unittest.cc

 // Copyright 2013 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 "ash/display/display_change_observer_chromeos.h"
 
 #include "ash/display/display_info.h"
 #include "base/memory/scoped_vector.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/display/chromeos/display_configurator.h"
 #include "ui/display/chromeos/display_mode.h"
-#include "ui/display/chromeos/output_configurator.h"
 #include "ui/display/chromeos/test/test_display_snapshot.h"
 
-using ui::OutputConfigurator;
+using ui::DisplayConfigurator;
 
 typedef testing::Test DisplayChangeObserverTest;
 
 namespace ash {
 
 TEST_F(DisplayChangeObserverTest, GetDisplayModeList) {
   ScopedVector<const ui::DisplayMode> modes;
   modes.push_back(new ui::DisplayMode(gfx::Size(1920, 1200), false, 60));
 
   // All non-interlaced (as would be seen with different refresh rates).
@@ skipping 12 matching lines @@
   // Mixed.
   modes.push_back(new ui::DisplayMode(gfx::Size(1024, 600), true, 60));
   modes.push_back(new ui::DisplayMode(gfx::Size(1024, 600), false, 70));
   modes.push_back(new ui::DisplayMode(gfx::Size(1024, 600), false, 60));
 
   // Just one interlaced mode.
   modes.push_back(new ui::DisplayMode(gfx::Size(640, 480), true, 60));
 
   ui::TestDisplaySnapshot display_snapshot;
   display_snapshot.set_modes(modes.get());
-  OutputConfigurator::DisplayState output;
+  DisplayConfigurator::DisplayState output;
   output.display = &display_snapshot;
 
   std::vector<DisplayMode> display_modes =
       DisplayChangeObserver::GetDisplayModeList(output);
   ASSERT_EQ(6u, display_modes.size());
   EXPECT_EQ("1920x1200", display_modes[0].size.ToString());
   EXPECT_FALSE(display_modes[0].interlaced);
   EXPECT_EQ(display_modes[0].refresh_rate, 60);
 
   EXPECT_EQ("1920x1080", display_modes[1].size.ToString());
@@ skipping 18 matching lines @@
 
   // Outputs without any modes shouldn't cause a crash.
   modes.clear();
   display_snapshot.set_modes(modes.get());
 
   display_modes = DisplayChangeObserver::GetDisplayModeList(output);
   EXPECT_EQ(0u, display_modes.size());
 }
 
 }  // namespace ash