Remove LauncherItemController::type; use ShelfItems::type.

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

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
index 01e0a3d26dd7b697c31c7dd71f615344358c614e..96659c71e8150f7245bd77a77a00fbf0dd0e4b52 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
@@ -250,10 +250,7 @@ class TestV2AppLauncherItemController : public LauncherItemController {
  public:
   TestV2AppLauncherItemController(const std::string& app_id,
                                   ChromeLauncherController* controller)
-      : LauncherItemController(LauncherItemController::TYPE_APP,
-                               app_id,
-                               "",
-                               controller) {}
+      : LauncherItemController(app_id, "", controller) {}
 
   ~TestV2AppLauncherItemController() override {}
 
@@ -421,6 +418,7 @@ class ChromeLauncherControllerImplTest : public BrowserWithTestWindowTest {
         launcher_controller_.get());
     launcher_controller_->SetItemController(id, test_controller_);
     DCHECK(launcher_controller_->IsPlatformApp(id));
+    launcher_controller_->SetItemStatus(id, ash::STATUS_RUNNING);
   }
 
   // Sets the stage for a multi user test.
@@ -3515,9 +3513,8 @@ TEST_F(ChromeLauncherControllerImplTest, MultipleAppIconLoaders) {
                     std::unique_ptr<AppIconLoader>(app_icon_loader2));
 
   AppWindowLauncherItemController* app_controller3 =
-      new ExtensionAppWindowLauncherItemController(
-          LauncherItemController::TYPE_APP, app_id3, "id",
-          launcher_controller_.get());
+      new ExtensionAppWindowLauncherItemController(app_id3, "id",
+                                                   launcher_controller_.get());
   const ash::ShelfID shelfId3 = launcher_controller_->CreateAppLauncherItem(
       app_controller3, app_id3, ash::STATUS_RUNNING);
   EXPECT_EQ(0, app_icon_loader1->fetch_count());
@@ -3526,9 +3523,8 @@ TEST_F(ChromeLauncherControllerImplTest, MultipleAppIconLoaders) {
   EXPECT_EQ(0, app_icon_loader2->clear_count());
 
   AppWindowLauncherItemController* app_controller2 =
-      new ExtensionAppWindowLauncherItemController(
-          LauncherItemController::TYPE_APP, app_id2, "id",
-          launcher_controller_.get());
+      new ExtensionAppWindowLauncherItemController(app_id2, "id",
+                                                   launcher_controller_.get());
   const ash::ShelfID shelfId2 = launcher_controller_->CreateAppLauncherItem(
       app_controller2, app_id2, ash::STATUS_RUNNING);
   EXPECT_EQ(0, app_icon_loader1->fetch_count());
@@ -3537,9 +3533,8 @@ TEST_F(ChromeLauncherControllerImplTest, MultipleAppIconLoaders) {
   EXPECT_EQ(0, app_icon_loader2->clear_count());
 
   AppWindowLauncherItemController* app_controller1 =
-      new ExtensionAppWindowLauncherItemController(
-          LauncherItemController::TYPE_APP, app_id1, "id",
-          launcher_controller_.get());
+      new ExtensionAppWindowLauncherItemController(app_id1, "id",
+                                                   launcher_controller_.get());
 
   const ash::ShelfID shelfId1 = launcher_controller_->CreateAppLauncherItem(
       app_controller1, app_id1, ash::STATUS_RUNNING);