Save and restore unified mode

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"
 #include "ash/display/display_manager.h"
 #include "ash/display/display_util.h"
 #include "ash/display/extended_mouse_warp_controller.h"
 #include "ash/display/mouse_cursor_event_filter.h"
 #include "ash/display/unified_mouse_warp_controller.h"
 #include "ash/shell.h"
+#include "base/command_line.h"
 #include "base/strings/string_split.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/display.h"
 
 namespace ash {
 namespace test {
 typedef std::vector<gfx::Display> DisplayList;
 typedef DisplayInfo DisplayInfo;
@@ skipping 59 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);
+#endif
+}
+
 DisplayManagerTestApi::DisplayManagerTestApi(DisplayManager* display_manager)
     : display_manager_(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 44 matching lines @@
 
 void DisplayManagerTestApi::SetAvailableColorProfiles(
     int64 display_id,
     const std::vector<ui::ColorCalibrationProfile>& profiles) {
   display_manager_->display_info_[display_id].set_available_color_profiles(
       profiles);
 }
 
 }  // namespace test
 }  // namespace ash