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

ash/wm/workspace/workspace_layout_manager_unittest.cc

Index: ash/wm/workspace/workspace_layout_manager_unittest.cc
diff --git a/ash/wm/workspace/workspace_layout_manager_unittest.cc b/ash/wm/workspace/workspace_layout_manager_unittest.cc
index 3dce5b015c98c307c8e67d5f65cac5b0393ce720..b9f255f5cd6393974462a48e174e4f6b859caf20 100644
--- a/ash/wm/workspace/workspace_layout_manager_unittest.cc
+++ b/ash/wm/workspace/workspace_layout_manager_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "ash/wm/workspace/workspace_layout_manager.h"
 
+#include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/shelf/shelf_layout_manager.h"
@@ -12,6 +13,7 @@
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/window_util.h"
+#include "base/command_line.h"

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

Is this needed?

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

Done.

 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/test_windows.h"
@@ -138,7 +140,7 @@ TEST_F(WorkspaceLayoutManagerTest, MaximizeInDisplayToBeRestored) {
   // is inside 2nd display.
   wm::MaximizeWindow(window.get());
   EXPECT_EQ(root_windows[1], window->GetRootWindow());
-  EXPECT_EQ("300,0 400x452", window->GetBoundsInScreen().ToString());
+  EXPECT_EQ("300,0 400x453", window->GetBoundsInScreen().ToString());
 
   wm::RestoreWindow(window.get());
   EXPECT_EQ(root_windows[1], window->GetRootWindow());
@@ -149,7 +151,7 @@ TEST_F(WorkspaceLayoutManagerTest, MaximizeInDisplayToBeRestored) {
   SetRestoreBoundsInScreen(window.get(), gfx::Rect(280, 0, 30, 40));
   wm::MaximizeWindow(window.get());
   EXPECT_EQ(root_windows[1], window->GetRootWindow());
-  EXPECT_EQ("300,0 400x452", window->GetBoundsInScreen().ToString());
+  EXPECT_EQ("300,0 400x453", window->GetBoundsInScreen().ToString());
 
   wm::RestoreWindow(window.get());
   EXPECT_EQ(root_windows[1], window->GetRootWindow());
@@ -165,7 +167,7 @@ TEST_F(WorkspaceLayoutManagerTest, MaximizeInDisplayToBeRestored) {
   w1->Show();
   EXPECT_TRUE(w1->IsMaximized());
   EXPECT_EQ(root_windows[1], w1->GetNativeView()->GetRootWindow());
-  EXPECT_EQ("300,0 400x452", w1->GetWindowBoundsInScreen().ToString());
+  EXPECT_EQ("300,0 400x453", w1->GetWindowBoundsInScreen().ToString());
   w1->Restore();
   EXPECT_EQ(root_windows[1], w1->GetNativeView()->GetRootWindow());
   EXPECT_EQ("400,0 30x40", w1->GetWindowBoundsInScreen().ToString());