Revert 262516 "Remove title and icon from chrome apps native style title bars."

chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc

Index: chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc
diff --git a/chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc b/chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc
index 8ba53c763f59629e1fb57c7bd4a9b8111553ef8c..3d8879db2991d78f3fe03e423e8004debb1a0b32 100644
--- a/chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc
+++ b/chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc
@@ -11,10 +11,6 @@
 #include "ui/views/controls/webview/webview.h"
 #include "ui/wm/core/easy_resize_window_targeter.h"
 
-#if defined(OS_WIN)
-#include "chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h"
-#endif
-
 class ShapedAppWindowTargeterTest : public aura::test::AuraTestBase {
  public:
   ShapedAppWindowTargeterTest()
@@ -53,11 +49,7 @@ class ShapedAppWindowTargeterTest : public aura::test::AuraTestBase {
  private:
   views::WebView web_view_;
   scoped_ptr<views::Widget> widget_;
-#if defined(OS_WIN)
-  ChromeNativeAppWindowViewsWin app_window_;
-#else
   ChromeNativeAppWindowViews app_window_;
-#endif
 
   DISALLOW_COPY_AND_ASSIGN(ShapedAppWindowTargeterTest);
 };
@@ -192,10 +184,9 @@ TEST_F(ShapedAppWindowTargeterTest, ResizeInsetsWithinBounds) {
     EXPECT_EQ(window, move.target());
   }
 
-#if defined(OS_WIN)
-  // On Windows the non standard app frame has a easy resize targetter
-  // installed.
-  app_window_views()->CreateNonStandardAppFrame();
+  // The EasyResizeTargeter specifies an inset of 5px within the window.
+  app_window_views()->InstallEasyResizeTargeterOnContainer();
+
   {
     // An event in the center of the window should always have
     // |window| as its target.
@@ -219,5 +210,4 @@ TEST_F(ShapedAppWindowTargeterTest, ResizeInsetsWithinBounds) {
     ASSERT_FALSE(details.dispatcher_destroyed);
     EXPECT_EQ(root_window(), move.target());
   }
-#endif  // defined (OS_WIN)
 }