Gets mustash frames looking like that of ash

mash/wm/frame/header_painter_util.h

-// Copyright 2014 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef ASH_FRAME_HEADER_PAINTER_UTIL_H_
-#define ASH_FRAME_HEADER_PAINTER_UTIL_H_
+#ifndef MASH_WM_FRAME_HEADER_PAINTER_UTIL_H_
+#define MASH_WM_FRAME_HEADER_PAINTER_UTIL_H_
 
-#include "ash/ash_export.h"
 #include "base/macros.h"
 
 namespace gfx {
 class FontList;
 class Rect;
 }
 namespace views {
 class View;
 class Widget;
 }
 
-namespace ash {
+namespace mash {
+namespace wm {
 
 // Static-only helper class for functionality used accross multiple
 // implementations of HeaderPainter.
-class ASH_EXPORT HeaderPainterUtil {
+class HeaderPainterUtil {
  public:
   // Returns the radius of the header's corners when the window is restored.
   static int GetTopCornerRadiusWhenRestored();
 
   // Returns the default distance between the left edge of the window and the
   // leftmost view in the header.
   static int GetDefaultLeftViewXInset();
 
   // Returns the amount that the frame background is inset from the left edge of
   // the window.
   static int GetThemeBackgroundXInset();
 
   // Returns the bounds for the header's title given the views to the left and
   // right of the title, and the font used.
   // |left_view| should be NULL if there is no view to the left of the title.
   static gfx::Rect GetTitleBounds(const views::View* left_view,
                                   const views::View* right_view,
                                   const gfx::FontList& title_font_list);
 
   // Returns true if the header for |widget| can animate to new visuals when the
   // widget's activation changes. Returns false if the header should switch to
   // new visuals instantaneously.
   static bool CanAnimateActivation(views::Widget* widget);
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(HeaderPainterUtil);
 };
 
-}  // namespace ash
+}  // namespace wm
+}  // namespace mash
 
-#endif  // ASH_FRAME_HEADER_PAINTER_UTIL_H_
+#endif  // MASH_WM_FRAME_HEADER_PAINTER_UTIL_H_