Gets mustash frames looking like that of ash

mash/wm/frame/default_header_painter.h

Index: mash/wm/frame/default_header_painter.h
diff --git a/ash/frame/default_header_painter.h b/mash/wm/frame/default_header_painter.h
similarity index 83%
copy from ash/frame/default_header_painter.h
copy to mash/wm/frame/default_header_painter.h
index a79f3d5f47092a9d00b820a6dc7242430102ef60..5e59cb8cb4b50aca36ff66ab7302268a73238cb5 100644
--- a/ash/frame/default_header_painter.h
+++ b/mash/wm/frame/default_header_painter.h
@@ -1,16 +1,14 @@
-// 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_DEFAULT_HEADER_PAINTER_H_
-#define ASH_FRAME_DEFAULT_HEADER_PAINTER_H_
+#ifndef MASH_WM_FRAME_DEFAULT_HEADER_PAINTER_H_
+#define MASH_WM_FRAME_DEFAULT_HEADER_PAINTER_H_
 
-#include "ash/ash_export.h"
-#include "ash/frame/header_painter.h"
 #include "base/basictypes.h"
-#include "base/compiler_specific.h"  // override
-#include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
+#include "mash/wm/frame/header_painter.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/animation/animation_delegate.h"
 
@@ -24,12 +22,14 @@ class View;
 class Widget;
 }
 
-namespace ash {
+namespace mash {
+namespace wm {
+
 class FrameCaptionButtonContainerView;
 
 // Helper class for painting the default window header.
-class ASH_EXPORT DefaultHeaderPainter : public HeaderPainter,
-                                        public gfx::AnimationDelegate {
+class DefaultHeaderPainter : public HeaderPainter,
+                             public gfx::AnimationDelegate {
  public:
   DefaultHeaderPainter();
   ~DefaultHeaderPainter() override;
@@ -57,9 +57,6 @@ class ASH_EXPORT DefaultHeaderPainter : public HeaderPainter,
   void SetFrameColors(SkColor active_frame_color, SkColor inactive_frame_color);
 
  private:
-  FRIEND_TEST_ALL_PREFIXES(DefaultHeaderPainterTest, TitleIconAlignment);
-  FRIEND_TEST_ALL_PREFIXES(DefaultHeaderPainterTest, LightIcons);
-
   // gfx::AnimationDelegate override:
   void AnimationProgressed(const gfx::Animation* animation) override;
 
@@ -119,6 +116,7 @@ class ASH_EXPORT DefaultHeaderPainter : public HeaderPainter,
   DISALLOW_COPY_AND_ASSIGN(DefaultHeaderPainter);
 };
 
-}  // namespace ash
+}  // namespace wm
+}  // namespace mash
 
-#endif  // ASH_FRAME_DEFAULT_HEADER_PAINTER_H_
+#endif  // MASH_WM_FRAME_DEFAULT_HEADER_PAINTER_H_