Introduce DisplayConfigurationController

ash/display/display_manager_unittest.cc

 // Copyright (c) 2012 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_manager.h"
 
 #include "ash/accelerators/accelerator_commands.h"
 #include "ash/ash_switches.h"
 #include "ash/display/display_info.h"
 #include "ash/display/display_layout_store.h"
@@ skipping 1414 matching lines @@
   EXPECT_EQ("top, -70",
             DisplayLayout(DisplayLayout::BOTTOM, 70).Invert().ToString());
   EXPECT_EQ("top, 80",
             DisplayLayout(DisplayLayout::BOTTOM, -80).Invert().ToString());
 }
 
 TEST_F(DisplayManagerTest, NotifyPrimaryChange) {
   if (!SupportsMultipleDisplays())
     return;
   UpdateDisplay("500x500,500x500");
-  ash::Shell::GetInstance()->window_tree_host_manager()->SwapPrimaryDisplay();
+  Shell::GetInstance()->window_tree_host_manager()->SwapPrimaryDisplayForTest();
   reset();
   UpdateDisplay("500x500");
   EXPECT_FALSE(changed_metrics() & gfx::DisplayObserver::DISPLAY_METRIC_BOUNDS);
   EXPECT_FALSE(changed_metrics() &
                gfx::DisplayObserver::DISPLAY_METRIC_WORK_AREA);
   EXPECT_TRUE(changed_metrics() &
               gfx::DisplayObserver::DISPLAY_METRIC_PRIMARY);
 
   UpdateDisplay("500x500,500x500");
-  ash::Shell::GetInstance()->window_tree_host_manager()->SwapPrimaryDisplay();
+  Shell::GetInstance()->window_tree_host_manager()->SwapPrimaryDisplayForTest();
   reset();
   UpdateDisplay("500x400");
   EXPECT_TRUE(changed_metrics() & gfx::DisplayObserver::DISPLAY_METRIC_BOUNDS);
   EXPECT_TRUE(changed_metrics() &
               gfx::DisplayObserver::DISPLAY_METRIC_WORK_AREA);
   EXPECT_TRUE(changed_metrics() &
               gfx::DisplayObserver::DISPLAY_METRIC_PRIMARY);
 }
 
 TEST_F(DisplayManagerTest, NotifyPrimaryChangeUndock) {
@@ skipping 561 matching lines @@
   layout_store->RegisterLayoutForDisplayIdPair(id2, id1, bad);
 
   EXPECT_EQ(good.ToString(), layout_store->GetRegisteredDisplayLayout(
                                              CreateDisplayIdPair(id1, id2))
                                  .ToString());
 }
 
 #endif  // OS_CHROMEOS
 
 }  // namespace ash