Allow dynamic enabling/disabling of unified desktop

ash/test/display_manager_test_api.cc

Index: ash/test/display_manager_test_api.cc
diff --git a/ash/test/display_manager_test_api.cc b/ash/test/display_manager_test_api.cc
index 434c7a91117b58f4f2af2b8041bcaa9acac54ab9..73fb2d8d02a2e0deef03f969f36e0c69e20df37d 100644
--- a/ash/test/display_manager_test_api.cc
+++ b/ash/test/display_manager_test_api.cc
@@ -95,18 +95,6 @@ bool DisplayManagerTestApi::TestIfMouseWarpsAt(
   }
 }
 
-// static
-void DisplayManagerTestApi::EnableUnifiedDesktopForTest() {
-#if defined(OS_CHROMEOS)
-  base::CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kAshEnableUnifiedDesktop);
-  Shell::GetInstance()
-      ->display_manager()
-      ->layout_store()
-      ->SetDefaultDisplayLayout(DisplayLayout());
-#endif
-}
-
 DisplayManagerTestApi::DisplayManagerTestApi()
     : display_manager_(Shell::GetInstance()->display_manager()) {}