Remove ash-disable-launcher-per-display flag

ash/screen_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/screen_ash.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_widget.h"
@@ skipping 20 matching lines @@
       NULL, CurrentContext(), gfx::Rect(10, 10, 100, 100));
   primary->Show();
   views::Widget* secondary = views::Widget::CreateWindowWithContextAndBounds(
       NULL, CurrentContext(), gfx::Rect(610, 10, 100, 100));
   secondary->Show();
 
   // Maximized bounds
   EXPECT_EQ("0,0 600x597",
             ScreenAsh::GetMaximizedWindowBoundsInParent(
                 primary->GetNativeView()).ToString());
-  if (Shell::IsLauncherPerDisplayEnabled()) {
-    EXPECT_EQ("0,0 500x452",
-              ScreenAsh::GetMaximizedWindowBoundsInParent(
-                  secondary->GetNativeView()).ToString());
-  } else {
-    EXPECT_EQ("0,0 500x500",
-              ScreenAsh::GetMaximizedWindowBoundsInParent(
-                  secondary->GetNativeView()).ToString());
-  }
+  EXPECT_EQ("0,0 500x452",
+            ScreenAsh::GetMaximizedWindowBoundsInParent(
+                secondary->GetNativeView()).ToString());
 
   // Display bounds
   EXPECT_EQ("0,0 600x600",
             ScreenAsh::GetDisplayBoundsInParent(
                 primary->GetNativeView()).ToString());
   EXPECT_EQ("0,0 500x500",
             ScreenAsh::GetDisplayBoundsInParent(
                 secondary->GetNativeView()).ToString());
 
   // Work area bounds
   EXPECT_EQ("0,0 600x597",
             ScreenAsh::GetDisplayWorkAreaBoundsInParent(
                 primary->GetNativeView()).ToString());
-  if (Shell::IsLauncherPerDisplayEnabled()) {
-    EXPECT_EQ("0,0 500x452",
-              ScreenAsh::GetDisplayWorkAreaBoundsInParent(
-                  secondary->GetNativeView()).ToString());
-  } else {
-    EXPECT_EQ("0,0 500x500",
-              ScreenAsh::GetDisplayWorkAreaBoundsInParent(
-                  secondary->GetNativeView()).ToString());
-  }
+  EXPECT_EQ("0,0 500x452",
+            ScreenAsh::GetDisplayWorkAreaBoundsInParent(
+                secondary->GetNativeView()).ToString());
 }
 
 // Test verifies a stable handling of secondary screen widget changes
 // (crbug.com/226132).
 TEST_F(ScreenAshTest, StabilityTest) {
   UpdateDisplay("600x600,500x500");
   views::Widget* secondary = views::Widget::CreateWindowWithContextAndBounds(
       NULL, CurrentContext(), gfx::Rect(610, 10, 100, 100));
   EXPECT_EQ(Shell::GetAllRootWindows()[1],
       secondary->GetNativeView()->GetRootWindow());
@@ skipping 29 matching lines @@
       ScreenAsh::ConvertRectToScreen(
           primary->GetNativeView(), gfx::Rect(30, 30, 100, 100)).ToString());
   EXPECT_EQ(
       "650,50 100x100",
       ScreenAsh::ConvertRectToScreen(
           secondary->GetNativeView(), gfx::Rect(40, 40, 100, 100)).ToString());
 }
 
 }  // namespace test
 }  // namespace ash