Moves mash/wm into ash/mus

ash/mus/frame/frame_border_hit_test_controller.cc

 // Copyright 2015 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/frame/frame_border_hit_test_controller.h"
+#include "ash/mus/frame/frame_border_hit_test_controller.h"
 
-#include "mash/wm/frame/caption_buttons/frame_caption_button_container_view.h"
+#include "ash/mus/frame/caption_buttons/frame_caption_button_container_view.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/views/window/non_client_view.h"
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
 // In the window corners, the resize areas don't actually expand bigger, but the
 // 16 px at the end of each edge triggers diagonal resizing.
 const int kResizeAreaCornerSize = 16;
 
 // Windows do not have a traditional visible window frame. Window content
 // extends to the edge of the window. We consider a small region outside the
 // window bounds and an even smaller region overlapping the window to be the
 // "non-client" area and use it for resizing.
 const int kResizeOutsideBoundsSize = 6;
@@ skipping 50 matching lines @@
     int caption_button_component = caption_button_container->NonClientHitTest(
         point_in_caption_button_container);
     if (caption_button_component != HTNOWHERE)
       return caption_button_component;
   }
 
   // Caption is a safe default.
   return HTCAPTION;
 }
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash