Don't allow windowed but not pinned applications to mix with shortcuts in the shelf launcher

chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

 // Copyright 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 "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 1738 matching lines @@
   base::ListValue policy_value1;
   InsertPrefValue(&policy_value1, 0, extension3_->id());
   InsertPrefValue(&policy_value1, 1, extension2_->id());
   InsertPrefValue(&policy_value1, 2, extension1_->id());
   profile()->GetTestingPrefService()->SetUserPref(prefs::kPinnedLauncherApps,
                                                   policy_value1.DeepCopy());
   EXPECT_EQ("AppList, Chrome, App3, App2, App1, ", GetPinnedAppStatus());
 
   // Going back to a status where there is no requirement for app 2 to be pinned
   // should convert it back to locked but not pinned and state. The position
-  // is determined by the |ShelfModel|'s weight system. Since at the moment
-  // the weight of a running app has the same as a shortcut, it will remain
-  // where it is. Surely note ideal, but since the sync process can shift around
-  // locations - as well as many other edge cases - this gets nearly impossible
-  // to get right.
-  // TODO(skuhne): Filed crbug.com/293761 to track of this.
+  // is determined by the |ShelfModel|'s weight system and since running
+  // applications are not allowed to be mixed with shortcuts, it should show up
+  // at the end of the list.
   base::ListValue policy_value2;
   InsertPrefValue(&policy_value2, 0, extension3_->id());
   InsertPrefValue(&policy_value2, 1, extension1_->id());
   profile()->GetTestingPrefService()->SetUserPref(prefs::kPinnedLauncherApps,
                                                   policy_value2.DeepCopy());
-  EXPECT_EQ("AppList, Chrome, App3, app2, App1, ", GetPinnedAppStatus());
+  EXPECT_EQ("AppList, Chrome, App3, App1, app2, ", GetPinnedAppStatus());
 
   // Removing an item should simply close it and everything should shift.
   base::ListValue policy_value3;
   InsertPrefValue(&policy_value3, 0, extension3_->id());
   profile()->GetTestingPrefService()->SetUserPref(prefs::kPinnedLauncherApps,
                                                   policy_value3.DeepCopy());
   EXPECT_EQ("AppList, Chrome, App3, app2, ", GetPinnedAppStatus());
 }
 
 // Check that a running and not pinned V2 application will be properly converted
@@ skipping 958 matching lines @@
 
   EXPECT_EQ(1, app_icon_loader->fetch_count());
   ASSERT_EQ(initial_size + 1, model_->items().size());
   EXPECT_TRUE(launcher_controller_->IsAppPinned("1"));
   EXPECT_FALSE(launcher_controller_->IsAppPinned("0"));
   EXPECT_EQ(ash::TYPE_APP_SHORTCUT, model_->items()[app_index].type);
 
   launcher_controller_->UnpinAppWithID("1");
   ASSERT_EQ(initial_size, model_->items().size());
 }