App icon from subfolder appears in the wrong place when pinning to shelf

ash/shelf/shelf_view_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/shelf/shelf_view.h"
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 #include <vector>
@@ skipping 375 matching lines @@
     CreateAndSetShelfItemDelegateForID(id);
     return id;
   }
 
   ShelfID AddPlatformApp() {
     ShelfID id = AddPlatformAppNoWait();
     test_api_->RunMessageLoopUntilAnimationsDone();
     return id;
   }
 
+  void SetShelfItemTypeToAppShortcut(ShelfID id) {
+    int index = model_->ItemIndexByID(id);
+    DCHECK_GE(index, 0);
+
+    ShelfItem item = model_->items()[index];
+
+    if (item.type == TYPE_PLATFORM_APP || item.type == TYPE_WINDOWED_APP) {
+      item.type = TYPE_APP_SHORTCUT;
+      model_->Set(index, item);
+    }
+    test_api_->RunMessageLoopUntilAnimationsDone();
+  }
+
   void RemoveByID(ShelfID id) {
     model_->RemoveItemAt(model_->ItemIndexByID(id));
     test_api_->RunMessageLoopUntilAnimationsDone();
   }
 
   ShelfButton* GetButtonByID(ShelfID id) {
     int index = model_->ItemIndexByID(id);
     return test_api_->GetButton(index);
   }
 
@@ skipping 1403 matching lines @@
 TEST_F(ShelfViewTest, CheckDragAndDropFromOverflowBubbleToShelf) {
   AddButtonsUntilOverflow();
   // Add one more button to prevent the overflow bubble to disappear upon
   // dragging an item out on windows (flakiness, see crbug.com/425097).
   AddAppShortcut();
 
   TestDraggingAnItemFromOverflowToShelf(false);
   TestDraggingAnItemFromOverflowToShelf(true);
 }
 
+// Checks creating app shortcut for an opened platform app in overflow bubble
+// should be invisible to the shelf. See crbug.com/605793.
+TEST_F(ShelfViewTest, CheckOverflowStatusPinOpenedAppToShelf) {
+  AddButtonsUntilOverflow();
+
+  // Add a running Platform app.
+  ShelfID platform_app_id = AddPlatformApp();
+  EXPECT_FALSE(GetButtonByID(platform_app_id)->visible());
+
+  // Make the added running platform app to be an app shortcut.
+  // This app shortcut should be a swapped view in overflow bubble, which is
+  // invisible.
+  SetShelfItemTypeToAppShortcut(platform_app_id);
+  EXPECT_FALSE(GetButtonByID(platform_app_id)->visible());
+}
+
 // Tests that the AppListButton renders as active in response to touches.
 TEST_F(ShelfViewTest, AppListButtonTouchFeedback) {
   AppListButton* app_list_button =
       static_cast<AppListButton*>(shelf_view_->GetAppListButtonView());
   EXPECT_FALSE(app_list_button->draw_background_as_active());
 
   ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
   generator.set_current_location(app_list_button->
       GetBoundsInScreen().CenterPoint());
   generator.PressTouch();
@@ skipping 127 matching lines @@
   test_api_->RunMessageLoopUntilAnimationsDone();
   CheckAllItemsAreInBounds();
 }
 
 INSTANTIATE_TEST_CASE_P(LtrRtl, ShelfViewTextDirectionTest, testing::Bool());
 INSTANTIATE_TEST_CASE_P(VisibleBounds, ShelfViewVisibleBoundsTest,
     testing::Bool());
 
 }  // namespace test
 }  // namespace ash