Move WindowModalityController to CoreWm.

ui/aura/test/test_activation_client.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 "ui/aura/test/test_activation_client.h"
 
 #include "ui/aura/client/activation_change_observer.h"
 #include "ui/aura/client/activation_delegate.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
@@ skipping 27 matching lines @@
   observers_.RemoveObserver(observer);
 }
 
 void TestActivationClient::ActivateWindow(Window* window) {
   Window* last_active = GetActiveWindow();
   if (last_active == window)
     return;
 
   RemoveActiveWindow(window);
   active_windows_.push_back(window);
+  window->parent()->StackChildAtTop(window);
   window->AddObserver(this);
 
   FOR_EACH_OBSERVER(client::ActivationChangeObserver,
                     observers_,
                     OnWindowActivated(window, last_active));
 
   if (aura::client::GetActivationDelegate(window))
     aura::client::GetActivationDelegate(window)->OnActivated();
 
   if (last_active && aura::client::GetActivationDelegate(last_active))
@@ skipping 45 matching lines @@
     if (active_windows_[i] == window) {
       active_windows_.erase(active_windows_.begin() + i);
       window->RemoveObserver(this);
       return;
     }
   }
 }
 
 }  // namespace test
 }  // namespace aura