Remove ash-disable-launcher-per-display flag

ash/shelf/shelf_widget_unittest.cc

 // Copyright (c) 2013 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/shelf/shelf_widget.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_button.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_view.h"
@@ skipping 86 matching lines @@
     TestLauncherAlignment(root_windows[0],
                           SHELF_ALIGNMENT_RIGHT,
                           "0,0 252x300");
   }
   {
     SCOPED_TRACE("Primary Left");
     TestLauncherAlignment(root_windows[0],
                           SHELF_ALIGNMENT_LEFT,
                           "48,0 252x300");
   }
-  if (Shell::IsLauncherPerDisplayEnabled()) {
-    {
-      SCOPED_TRACE("Secondary Bottom");
-      TestLauncherAlignment(root_windows[1],
-                            SHELF_ALIGNMENT_BOTTOM,
-                            "300,0 500x452");
-    }
-    {
-      SCOPED_TRACE("Secondary Right");
-      TestLauncherAlignment(root_windows[1],
-                            SHELF_ALIGNMENT_RIGHT,
-                            "300,0 452x500");
-    }
-    {
-      SCOPED_TRACE("Secondary Left");
-      TestLauncherAlignment(root_windows[1],
-                            SHELF_ALIGNMENT_LEFT,
-                            "348,0 452x500");
-    }
+  {
+    SCOPED_TRACE("Secondary Bottom");
+    TestLauncherAlignment(root_windows[1],
+                          SHELF_ALIGNMENT_BOTTOM,
+                          "300,0 500x452");
+  }
+  {
+    SCOPED_TRACE("Secondary Right");
+    TestLauncherAlignment(root_windows[1],
+                          SHELF_ALIGNMENT_RIGHT,
+                          "300,0 452x500");
+  }
+  {
+    SCOPED_TRACE("Secondary Left");
+    TestLauncherAlignment(root_windows[1],
+                          SHELF_ALIGNMENT_LEFT,
+                          "348,0 452x500");
   }
 }
 
 // Makes sure the launcher is initially sized correctly.
 TEST_F(ShelfWidgetTest, LauncherInitiallySized) {
   ShelfWidget* shelf_widget = GetShelfWidget();
   Launcher* launcher = shelf_widget->launcher();
   ASSERT_TRUE(launcher);
   internal::ShelfLayoutManager* shelf_layout_manager = GetShelfLayoutManager();
   ASSERT_TRUE(shelf_layout_manager);
@@ skipping 11 matching lines @@
   views::Widget* widget = new views::Widget;
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
   params.bounds = gfx::Rect(0, 0, 200, 200);
   params.context = CurrentContext();
   // Widget is now owned by the parent window.
   widget->Init(params);
   widget->SetFullscreen(true);
 }
 
 }  // namespace ash