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

ash/wm/custom_frame_view_ash_unittest.cc

 // Copyright (c) 2012 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 "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"
 #include "ash/wm/property_util.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/frame_maximize_button.h"
 #include "ash/wm/workspace/snap_sizer.h"
 #include "base/command_line.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/focus_client.h"
@@ skipping 243 matching lines @@
     end.Offset(40, 0);
     generator.GestureScrollSequence(center, end,
         base::TimeDelta::FromMilliseconds(100),
         3);
     RunAllPendingInMessageLoop();
 
     EXPECT_FALSE(ash::wm::IsWindowMaximized(window));
     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.
   {
     center = view->GetBoundsInScreen().CenterPoint();
     gfx::Point end = center;
     end.Offset(-40, 0);
     generator.GestureScrollSequence(center, end,
         base::TimeDelta::FromMilliseconds(100),
         3);
@@ skipping 581 matching lines @@
 
   // Check that there was no size change.
   EXPECT_EQ(widget->GetWindowBoundsInScreen().size().ToString(),
             window_position.size().ToString());
   // Check that there is no phantom window left open.
   EXPECT_FALSE(maximize_button->phantom_window_open());
 }
 
 }  // namespace internal
 }  // namespace ash