Revert 170406 - Align panel icons on the right / end.

ash/launcher/launcher_model_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/launcher/launcher_model.h"
 
 #include <set>
 #include <string>
 
 #include "ash/launcher/launcher_model_observer.h"
@@ skipping 157 matching lines @@
   EXPECT_EQ(browser + 1, app_shortcut_index3);
 
   item.type = TYPE_APP_SHORTCUT;
   int app_shortcut_index4 = model.AddAt(5, item);
   EXPECT_EQ(browser + 4, app_shortcut_index4);
 
   item.type = TYPE_APP_SHORTCUT;
   int app_shortcut_index5 = model.AddAt(2, item);
   EXPECT_EQ(browser + 2, app_shortcut_index5);
 
-  // Before there are any panels, no icons should be right aligned.
-  EXPECT_EQ(model.item_count(), model.FirstPanelIndex());
-
   // Check that AddAt() figures out the correct indexes for tabs and panels.
   item.type = TYPE_TABBED;
   int tabbed_index3 = model.AddAt(2, item);
   EXPECT_EQ(browser + 6, tabbed_index3);
 
   item.type = TYPE_APP_PANEL;
   int app_panel_index1 = model.AddAt(2, item);
-  EXPECT_EQ(browser + 10, app_panel_index1);
+  EXPECT_EQ(browser + 6, app_panel_index1);
 
   item.type = TYPE_TABBED;
   int tabbed_index4 = model.AddAt(11, item);
-  EXPECT_EQ(browser + 9, tabbed_index4);
+  EXPECT_EQ(browser + 10, tabbed_index4);
 
   item.type = TYPE_APP_PANEL;
-  int app_panel_index2 = model.AddAt(15, item);
-  EXPECT_EQ(browser + 12, app_panel_index2);
+  int app_panel_index2 = model.AddAt(12, item);
+  EXPECT_EQ(browser + 11, app_panel_index2);
 
   item.type = TYPE_TABBED;
   int tabbed_index5 = model.AddAt(7, item);
   EXPECT_EQ(browser + 7, tabbed_index5);
 
   item.type = TYPE_APP_PANEL;
-  int app_panel_index3 = model.AddAt(13, item);
-  EXPECT_EQ(browser + 13, app_panel_index3);
-
-  // Right aligned index should be the first app panel index.
-  EXPECT_EQ(browser + 12, model.FirstPanelIndex());
+  int app_panel_index3 = model.AddAt(8, item);
+  EXPECT_EQ(browser + 8, app_panel_index3);
 
   // Browser shortcut and app list should still be first and second.
   EXPECT_EQ(TYPE_BROWSER_SHORTCUT, model.items()[0].type);
-  EXPECT_EQ(TYPE_APP_LIST, model.items()[model.FirstPanelIndex() - 1].type);
+  EXPECT_EQ(TYPE_APP_LIST, model.items()[model.items().size() - 1].type);
 }
 
 }  // namespace ash