Make ui::DisplayConfigurator a singleton

ui/display/chromeos/display_configurator_unittest.cc

Index: ui/display/chromeos/display_configurator_unittest.cc
diff --git a/ui/display/chromeos/display_configurator_unittest.cc b/ui/display/chromeos/display_configurator_unittest.cc
index 6b940be5be0c88dc770c5ed5ac4a9d8713948b29..dd99ab5e0fec68e6acb9fbbf9518281b9c282530 100644
--- a/ui/display/chromeos/display_configurator_unittest.cc
+++ b/ui/display/chromeos/display_configurator_unittest.cc
@@ -112,6 +112,8 @@ class TestMirroringController
   DISALLOW_COPY_AND_ASSIGN(TestMirroringController);
 };
 
+}  // namespace
+
 class DisplayConfiguratorTest : public testing::Test {
  public:
   enum CallbackResult {
@@ -227,8 +229,6 @@ class DisplayConfiguratorTest : public testing::Test {
   DISALLOW_COPY_AND_ASSIGN(DisplayConfiguratorTest);
 };
 
-}  // namespace
-
 TEST_F(DisplayConfiguratorTest, FindDisplayModeMatchingSize) {
   ScopedVector<const DisplayMode> modes;