Allow dynamic enabling/disabling of unified desktop

ash/test/display_manager_test_api.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/test/display_manager_test_api.h"
 
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_info.h"
@@ skipping 77 matching lines @@
     gfx::Screen* screen = gfx::Screen::GetScreenFor(context);
     gfx::Display original_display =
         screen->GetDisplayNearestPoint(point_in_screen);
     event_generator.MoveMouseTo(point_in_screen);
     return original_display.id() !=
            screen->GetDisplayNearestPoint(
                        aura::Env::GetInstance()->last_mouse_location()).id();
   }
 }
 
-// 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()) {}
 
 DisplayManagerTestApi::~DisplayManagerTestApi() {}
 
 void DisplayManagerTestApi::UpdateDisplay(
     const std::string& display_specs) {
   std::vector<DisplayInfo> display_info_list =
       CreateDisplayInfoListFromString(display_specs, display_manager_);
   bool is_host_origin_set = false;
@@ skipping 70 matching lines @@
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   const DisplayInfo& info = display_manager->GetDisplayInfo(display_id);
   DisplayMode mode;
   if (!GetDisplayModeForResolution(info, resolution, &mode))
     return false;
   return display_manager->SetDisplayMode(display_id, mode);
 }
 
 }  // namespace test
 }  // namespace ash