mash: Move LauncherItemController to ash, rename ShelfItemDelegate.

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

 // Copyright 2016 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/common/shelf/shelf_delegate.h"
+#include "ash/public/cpp/shelf_item_delegate.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/arc/arc_auth_notification.h"
 #include "chrome/browser/chromeos/arc/arc_service_launcher.h"
 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
 #include "chrome/browser/chromeos/arc/arc_util.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/ui/app_list/app_list_service.h"
 #include "chrome/browser/ui/app_list/app_list_syncable_service.h"
 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
 #include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
-#include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
 #include "components/arc/arc_util.h"
 #include "content/public/test/browser_test_utils.h"
 #include "ui/events/event_constants.h"
 
 namespace mojo {
 
 template <>
 struct TypeConverter<arc::mojom::AppInfoPtr, arc::mojom::AppInfo> {
   static arc::mojom::AppInfoPtr Convert(const arc::mojom::AppInfo& app_info) {
     return app_info.Clone();
@@ skipping 214 matching lines @@
     if (arc_session_manager()->profile() != profile())
       arc::ArcServiceLauncher::Get()->OnPrimaryUserProfilePrepared(profile());
     app_instance_observer()->OnInstanceReady();
   }
 
   void StopInstance() {
     arc_session_manager()->Shutdown();
     app_instance_observer()->OnInstanceClosed();
   }
 
-  LauncherItemController* GetAppItemController(const std::string& id) {
+  ash::ShelfItemDelegate* GetAppItemController(const std::string& id) {
     const ash::ShelfID shelf_id = shelf_delegate()->GetShelfIDForAppID(id);
     if (!shelf_id)
       return nullptr;
-    return chrome_controller()->GetLauncherItemController(shelf_id);
+    return chrome_controller()->GetShelfItemDelegate(shelf_id);
   }
 
   ArcAppListPrefs* app_prefs() { return ArcAppListPrefs::Get(profile()); }
 
   // Returns as AppHost interface in order to access to private implementation
   // of the interface.
   arc::mojom::AppHost* app_host() { return app_prefs(); }
 
   // Returns as AppInstance observer interface in order to access to private
   // implementation of the interface.
@@ skipping 82 matching lines @@
         EXPECT_TRUE(shelf_delegate()->GetShelfIDForAppID(app_id));
       else
         EXPECT_FALSE(shelf_delegate()->GetShelfIDForAppID(app_id));
       break;
     case TEST_ACTION_EXIT:
       // Just exist Chrome.
       break;
     case TEST_ACTION_CLOSE:
       // Close item during animation.
       {
-        LauncherItemController* controller = GetAppItemController(app_id);
+        ash::ShelfItemDelegate* controller = GetAppItemController(app_id);
         ASSERT_TRUE(controller);
         controller->Close();
         EXPECT_TRUE(chrome_controller()
                         ->GetArcDeferredLauncher()
                         ->GetActiveTime(app_id)
                         .is_zero());
         if (is_pinned())
           EXPECT_TRUE(shelf_delegate()->GetShelfIDForAppID(app_id));
         else
           EXPECT_FALSE(shelf_delegate()->GetShelfIDForAppID(app_id));
@@ skipping 123 matching lines @@
       arc::ArcAppShelfId(kTestShelfGroup, app_id).ToString();
   const std::string shelf_id2 =
       arc::ArcAppShelfId(kTestShelfGroup2, app_id).ToString();
   const std::string shelf_id3 =
       arc::ArcAppShelfId(kTestShelfGroup3, app_id).ToString();
 
   // 1 task for group 1
   app_host()->OnTaskCreated(1, info->package_name, info->activity, info->name,
                             CreateIntentUriWithShelfGroup(kTestShelfGroup));
 
-  LauncherItemController* controller1 = GetAppItemController(shelf_id1);
+  ash::ShelfItemDelegate* controller1 = GetAppItemController(shelf_id1);
   ASSERT_TRUE(controller1);
 
   // 2 tasks for group 2
   app_host()->OnTaskCreated(2, info->package_name, info->activity, info->name,
                             CreateIntentUriWithShelfGroup(kTestShelfGroup2));
 
-  LauncherItemController* controller2 = GetAppItemController(shelf_id2);
+  ash::ShelfItemDelegate* controller2 = GetAppItemController(shelf_id2);
   ASSERT_TRUE(controller2);
   ASSERT_NE(controller1, controller2);
 
   app_host()->OnTaskCreated(3, info->package_name, info->activity, info->name,
                             CreateIntentUriWithShelfGroup(kTestShelfGroup2));
 
   ASSERT_EQ(controller2, GetAppItemController(shelf_id2));
 
   // 2 tasks for group 3 which does not have shortcut.
   app_host()->OnTaskCreated(4, info->package_name, info->activity, info->name,
                             CreateIntentUriWithShelfGroup(kTestShelfGroup3));
 
-  LauncherItemController* controller3 = GetAppItemController(shelf_id3);
+  ash::ShelfItemDelegate* controller3 = GetAppItemController(shelf_id3);
   ASSERT_TRUE(controller3);
   ASSERT_NE(controller1, controller3);
   ASSERT_NE(controller2, controller3);
 
   app_host()->OnTaskCreated(5, info->package_name, info->activity, info->name,
                             CreateIntentUriWithShelfGroup(kTestShelfGroup3));
 
   ASSERT_EQ(controller3, GetAppItemController(shelf_id3));
 
   // Destroy task #0, this kills shelf group 1
   app_host()->OnTaskDestroyed(1);
   EXPECT_FALSE(GetAppItemController(shelf_id1));
 
   // Destroy task #1, shelf group 2 is still alive
   app_host()->OnTaskDestroyed(2);
   EXPECT_EQ(controller2, GetAppItemController(shelf_id2));
   // Destroy task #2, this kills shelf group 2
   app_host()->OnTaskDestroyed(3);
   EXPECT_FALSE(GetAppItemController(shelf_id2));
 
   // Disable ARC, this removes app and as result kills shelf group 3.
   arc::SetArcPlayStoreEnabledForProfile(profile(), false);
   EXPECT_FALSE(GetAppItemController(shelf_id3));
 }