Adds support for multiple displays to WmTestBase

ash/root_window_controller.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/root_window_controller.h"
 
 #include <queue>
 #include <vector>
 
 #include "ash/aura/aura_layout_manager_adapter.h"
@@ skipping 321 matching lines @@
 }
 
 WorkspaceController* RootWindowController::workspace_controller() {
   return wm_root_window_controller_->workspace_controller();
 }
 
 void RootWindowController::Shutdown() {
   WmShell::Get()->RemoveShellObserver(this);
 
 #if defined(OS_CHROMEOS)
-  if (touch_exploration_manager_) {
-    touch_exploration_manager_.reset();
-  }
+  touch_exploration_manager_.reset();
 #endif
 
   aura::Window* root_window = GetRootWindow();
   WmWindow* root_shutting_down = WmWindowAura::Get(root_window);
   WmShell* shell = WmShell::Get();
   // Change the target root window before closing child windows. If any child
   // being removed triggers a relayout of the shelf it will try to build a
   // window list adding windows from the target root window's containers which
   // may have already gone away.
   if (shell->GetRootWindowForNewWindows() == root_shutting_down) {
@@ skipping 533 matching lines @@
     aura::Window* primary_root_window = Shell::GetInstance()
                                             ->window_tree_host_manager()
                                             ->GetPrimaryRootWindow();
     return GetRootWindowSettings(primary_root_window)->controller;
   }
 
   return GetRootWindowSettings(root_window)->controller;
 }
 
 }  // namespace ash