Moves mash/wm into ash/mus

ash/mus/test/wm_test_screen.h

 // 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.
 
-#ifndef MASH_WM_WM_TEST_SCREEN_H_
-#define MASH_WM_WM_TEST_SCREEN_H_
+#ifndef ASH_MUS_TEST_WM_TEST_SCREEN_H_
+#define ASH_MUS_TEST_WM_TEST_SCREEN_H_
 
 #include "ui/display/screen.h"
 #include "ui/views/mus/display_list.h"
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
 // Screen implementation used by tests for the windowmanager. Does not talk
 // to mus. Tests must keep the list of Displays in sync manually.
 class WmTestScreen : public display::Screen {
  public:
   WmTestScreen();
   ~WmTestScreen() override;
 
   const views::DisplayList& display_list() const { return display_list_; }
   views::DisplayList* display_list() { return &display_list_; }
@@ skipping 12 matching lines @@
   display::Display GetDisplayMatching(
       const gfx::Rect& match_rect) const override;
   void AddObserver(display::DisplayObserver* observer) override;
   void RemoveObserver(display::DisplayObserver* observer) override;
 
   views::DisplayList display_list_;
 
   DISALLOW_COPY_AND_ASSIGN(WmTestScreen);
 };
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash
 
-#endif  // MASH_WM_WM_TEST_SCREEN_H_
+#endif  // ASH_MUS_TEST_WM_TEST_SCREEN_H_