ash:Shelf - Enable Alternate Shelf and Side Shelf by default.

ash/wm/custom_frame_view_ash_unittest.cc

Index: ash/wm/custom_frame_view_ash_unittest.cc
diff --git a/ash/wm/custom_frame_view_ash_unittest.cc b/ash/wm/custom_frame_view_ash_unittest.cc
index c08704679b8d1a8aa51ab83c01c4fbd2858b3ea2..36078759899668deb494e2de14abf906c36744dd 100644
--- a/ash/wm/custom_frame_view_ash_unittest.cc
+++ b/ash/wm/custom_frame_view_ash_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "ash/wm/custom_frame_view_ash.h"
 
+#include "ash/ash_switches.h"

[James Cook, 2013/08/22 00:19:12]

Is this needed?

[Harry McCleave, 2013/08/27 00:37:00]

Done.

 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/maximize_bubble_controller.h"
@@ -267,7 +268,7 @@ TEST_F(CustomFrameViewAshTest, MAYBE_ResizeButtonDrag) {
     EXPECT_FALSE(ash::wm::IsWindowMinimized(window));
     // This is a short resizing distance and different touch behavior
     // applies which leads in half of the screen being used.
-    EXPECT_EQ("400,0 400x552", window->bounds().ToString());
+    EXPECT_EQ("400,0 400x553", window->bounds().ToString());
   }
 
   // Snap left.