Moves mash/wm into ash/mus

ash/mus/test/wm_test_screen.cc

 // Copyright 2016 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 "mash/wm/test/wm_test_screen.h"
+#include "ash/mus/test/wm_test_screen.h"
 
 #include "ui/aura/window.h"
 #include "ui/display/display_finder.h"
 
 #undef NOTIMPLEMENTED
 #define NOTIMPLEMENTED() DVLOG(1) << "notimplemented"
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
 WmTestScreen::WmTestScreen() {
   display::Screen::SetScreenInstance(this);
 }
 
 WmTestScreen::~WmTestScreen() {
   if (display::Screen::GetScreen() == this)
     display::Screen::SetScreenInstance(nullptr);
 }
 
@@ skipping 48 matching lines @@
 }
 
 void WmTestScreen::AddObserver(display::DisplayObserver* observer) {
   display_list_.AddObserver(observer);
 }
 
 void WmTestScreen::RemoveObserver(display::DisplayObserver* observer) {
   display_list_.RemoveObserver(observer);
 }
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash