Allow dynamic enabling/disabling of unified desktop

ash/display/unified_mouse_warp_controller_unittest.cc

 // Copyright 2015 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/unified_mouse_warp_controller.h"
 
+#include "ash/display/display_manager.h"
 #include "ash/display/mouse_cursor_event_filter.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
 #include "ui/aura/env.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 
 namespace ash {
 
 class UnifiedMouseWarpControllerTest : public test::AshTestBase {
  public:
   UnifiedMouseWarpControllerTest() {}
   ~UnifiedMouseWarpControllerTest() override {}
 
   void SetUp() override {
     test::AshTestBase::SetUp();
-    test::DisplayManagerTestApi::EnableUnifiedDesktopForTest();
+    Shell::GetInstance()->display_manager()->SetUnifiedDesktopEnabled(true);
   }
 
  protected:
   bool TestIfMouseWarpsAt(const gfx::Point& point_in_screen) {
     return test::DisplayManagerTestApi::TestIfMouseWarpsAt(GetEventGenerator(),
                                                            point_in_screen);
   }
 
   MouseCursorEventFilter* event_filter() {
     return Shell::GetInstance()->mouse_cursor_filter();
@@ skipping 88 matching lines @@
   EXPECT_FALSE(TestIfMouseWarpsAt(gfx::Point(11, 499)));
   // Touch the right edge of the second display.
   EXPECT_FALSE(TestIfMouseWarpsAt(gfx::Point(999, 11)));
   // Touch the top edge of the second display.
   EXPECT_FALSE(TestIfMouseWarpsAt(gfx::Point(11, 0)));
   // Touch the bottom edge of the second display.
   EXPECT_FALSE(TestIfMouseWarpsAt(gfx::Point(11, 499)));
 }
 
 }  // namespace aura