ash: Remove ShelfModel id conversion functions.

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/public/cpp/shelf_item_delegate.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
@@ skipping 86 matching lines @@
     app->name = kTestAppName2;
     app->package_name = package_name;
     app->activity = kTestAppActivity2;
     app->sticky = false;
     apps.push_back(std::move(app));
   }
 
   return apps;
 }
 
-ChromeLauncherController* chrome_controller() {
-  return ChromeLauncherController::instance();
-}
-
 class AppAnimatedWaiter {
  public:
   explicit AppAnimatedWaiter(const std::string& app_id) : app_id_(app_id) {}
 
   void Wait() {
     const base::TimeDelta threshold =
         base::TimeDelta::FromMilliseconds(kAppAnimatedThresholdMs);
     ArcAppDeferredLauncherController* controller =
-        chrome_controller()->GetArcDeferredLauncher();
+        ChromeLauncherController::instance()->GetArcDeferredLauncher();
     while (controller->GetActiveTime(app_id_) < threshold) {
       base::RunLoop().RunUntilIdle();
     }
   }
 
  private:
   const std::string app_id_;
 };
 
 enum TestAction {
@@ skipping 119 matching lines @@
     app_instance_observer()->OnInstanceReady();
   }
 
   void StopInstance() {
     arc_session_manager()->Shutdown();
     app_instance_observer()->OnInstanceClosed();
   }
 
   ash::ShelfItemDelegate* GetShelfItemDelegate(const std::string& id) {
     ash::ShelfModel* model = ash::Shell::Get()->shelf_model();
-    return model->GetShelfItemDelegate(model->GetShelfIDForAppID(id));
+    return model->GetShelfItemDelegate(ash::ShelfID(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 26 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ArcAppDeferredLauncherBrowserTest);
 };
 
 // This tests simulates normal workflow for starting ARC app in deferred mode.
 IN_PROC_BROWSER_TEST_P(ArcAppDeferredLauncherBrowserTest, StartAppDeferred) {
   // Install app to remember existing apps.
   StartInstance();
   InstallTestApps(kTestAppPackage, false);
   SendPackageAdded(kTestAppPackage, false);
 
+  ChromeLauncherController* controller = ChromeLauncherController::instance();
   const std::string app_id = GetTestApp1Id(kTestAppPackage);
-  ash::ShelfModel* shelf_model = ash::Shell::Get()->shelf_model();
+  const ash::ShelfID shelf_id(app_id);
   if (is_pinned()) {
-    shelf_model->PinAppWithID(app_id);
-    const ash::ShelfID shelf_id = shelf_model->GetShelfIDForAppID(app_id);
-    EXPECT_FALSE(shelf_id.IsNull());
-    const ash::ShelfItem* item = chrome_controller()->GetItem(shelf_id);
+    controller->PinAppWithID(app_id);
+    const ash::ShelfItem* item = controller->GetItem(shelf_id);
     EXPECT_EQ(base::UTF8ToUTF16(kTestAppName), item->title);
   } else {
-    EXPECT_TRUE(shelf_model->GetShelfIDForAppID(app_id).IsNull());
+    EXPECT_FALSE(controller->GetItem(shelf_id));
   }
 
   StopInstance();
   std::unique_ptr<ArcAppListPrefs::AppInfo> app_info =
       app_prefs()->GetApp(app_id);
   EXPECT_FALSE(app_info);
 
   // Restart instance. App should be taken from prefs but its state is non-ready
   // currently.
   StartInstance();
   app_info = app_prefs()->GetApp(app_id);
   ASSERT_TRUE(app_info);
   EXPECT_FALSE(app_info->ready);
-  EXPECT_NE(is_pinned(), shelf_model->GetShelfIDForAppID(app_id).IsNull());
+  EXPECT_EQ(is_pinned(), controller->GetItem(shelf_id) != nullptr);
 
   // Launching non-ready ARC app creates item on shelf and spinning animation.
   arc::LaunchApp(profile(), app_id, ui::EF_LEFT_MOUSE_BUTTON);
-  const ash::ShelfID shelf_id = shelf_model->GetShelfIDForAppID(app_id);
-  EXPECT_FALSE(shelf_id.IsNull());
-  const ash::ShelfItem* item = chrome_controller()->GetItem(shelf_id);
+  const ash::ShelfItem* item = controller->GetItem(shelf_id);
   EXPECT_EQ(base::UTF8ToUTF16(kTestAppName), item->title);
   AppAnimatedWaiter(app_id).Wait();
 
   switch (test_action()) {
     case TEST_ACTION_START:
       // Now simulates that ARC is started and app list is refreshed. This
       // should stop animation and delete icon from the shelf.
       InstallTestApps(kTestAppPackage, false);
       SendPackageAdded(kTestAppPackage, false);
-      EXPECT_TRUE(chrome_controller()
-                      ->GetArcDeferredLauncher()
+      EXPECT_TRUE(controller->GetArcDeferredLauncher()
                       ->GetActiveTime(app_id)
                       .is_zero());
-      EXPECT_NE(is_pinned(), shelf_model->GetShelfIDForAppID(app_id).IsNull());
+      EXPECT_EQ(is_pinned(), controller->GetItem(shelf_id) != nullptr);
       break;
     case TEST_ACTION_EXIT:
       // Just exit Chrome.
       break;
     case TEST_ACTION_CLOSE:
       {
         // Close item during animation.
         ash::ShelfItemDelegate* delegate = GetShelfItemDelegate(app_id);
         ASSERT_TRUE(delegate);
         delegate->Close();
-        EXPECT_TRUE(chrome_controller()
-                        ->GetArcDeferredLauncher()
+        EXPECT_TRUE(controller->GetArcDeferredLauncher()
                         ->GetActiveTime(app_id)
                         .is_zero());
-        EXPECT_NE(is_pinned(),
-                  shelf_model->GetShelfIDForAppID(app_id).IsNull());
+        EXPECT_EQ(is_pinned(), controller->GetItem(shelf_id) != nullptr);
       }
       break;
   }
 }
 
 INSTANTIATE_TEST_CASE_P(ArcAppDeferredLauncherBrowserTestInstance,
                         ArcAppDeferredLauncherBrowserTest,
                         ::testing::ValuesIn(build_test_parameter));
 
 // This tests validates pin state on package update and remove.
 IN_PROC_BROWSER_TEST_F(ArcAppLauncherBrowserTest, PinOnPackageUpdateAndRemove) {
   StartInstance();
 
   // Make use app list sync service is started. Normally it is started when
   // sycing is initialized.
   app_list::AppListSyncableServiceFactory::GetForProfile(profile())->GetModel();
 
   InstallTestApps(kTestAppPackage, true);
   SendPackageAdded(kTestAppPackage, false);
 
-  const std::string app_id1 = GetTestApp1Id(kTestAppPackage);
-  const std::string app_id2 = GetTestApp2Id(kTestAppPackage);
-  ash::ShelfModel* shelf_model = ash::Shell::Get()->shelf_model();
-  shelf_model->PinAppWithID(app_id1);
-  shelf_model->PinAppWithID(app_id2);
-  const ash::ShelfID shelf_id1_before =
-      shelf_model->GetShelfIDForAppID(app_id1);
-  EXPECT_FALSE(shelf_id1_before.IsNull());
-  EXPECT_FALSE(shelf_model->GetShelfIDForAppID(app_id2).IsNull());
+  const ash::ShelfID shelf_id1(GetTestApp1Id(kTestAppPackage));
+  const ash::ShelfID shelf_id2(GetTestApp2Id(kTestAppPackage));
+  ChromeLauncherController* controller = ChromeLauncherController::instance();
+  controller->PinAppWithID(shelf_id1.app_id);
+  controller->PinAppWithID(shelf_id2.app_id);
+  EXPECT_TRUE(controller->GetItem(shelf_id1));
+  EXPECT_TRUE(controller->GetItem(shelf_id2));
 
   // Package contains only one app. App list is not shown for updated package.
   SendPackageUpdated(kTestAppPackage, false);
   // Second pin should gone.
-  EXPECT_EQ(shelf_id1_before, shelf_model->GetShelfIDForAppID(app_id1));
-  EXPECT_TRUE(shelf_model->GetShelfIDForAppID(app_id2).IsNull());
+  EXPECT_TRUE(controller->GetItem(shelf_id1));
+  EXPECT_FALSE(controller->GetItem(shelf_id2));
 
   // Package contains two apps. App list is not shown for updated package.
   SendPackageUpdated(kTestAppPackage, true);
   // Second pin should not appear.
-  EXPECT_EQ(shelf_id1_before, shelf_model->GetShelfIDForAppID(app_id1));
-  EXPECT_TRUE(shelf_model->GetShelfIDForAppID(app_id2).IsNull());
+  EXPECT_TRUE(controller->GetItem(shelf_id1));
+  EXPECT_FALSE(controller->GetItem(shelf_id2));
 
   // Package removed.
   SendPackageRemoved(kTestAppPackage);
   // No pin is expected.
-  EXPECT_TRUE(shelf_model->GetShelfIDForAppID(app_id1).IsNull());
-  EXPECT_TRUE(shelf_model->GetShelfIDForAppID(app_id2).IsNull());
+  EXPECT_FALSE(controller->GetItem(shelf_id1));
+  EXPECT_FALSE(controller->GetItem(shelf_id2));
 }
 
 // This test validates that app list is shown on new package and not shown
 // on package update.
 IN_PROC_BROWSER_TEST_F(ArcAppLauncherBrowserTest, AppListShown) {
   StartInstance();
   AppListService* app_list_service = AppListService::Get();
   ASSERT_TRUE(app_list_service);
 
   EXPECT_FALSE(app_list_service->IsAppListVisible());
@@ skipping 112 matching lines @@
   app_host()->OnTaskDestroyed(2);
   EXPECT_EQ(delegate2, GetShelfItemDelegate(shelf_id2));
   // Destroy task #2, this kills shelf group 2
   app_host()->OnTaskDestroyed(3);
   EXPECT_FALSE(GetShelfItemDelegate(shelf_id2));
 
   // Disable ARC, this removes app and as result kills shelf group 3.
   arc::SetArcPlayStoreEnabledForProfile(profile(), false);
   EXPECT_FALSE(GetShelfItemDelegate(shelf_id3));
 }