Replace ShelfItemDelegate::GetTitle() with ShelfItem::title.

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/common/wm_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/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"
@@ skipping 277 matching lines @@
 // 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);
 
   const std::string app_id = GetTestApp1Id(kTestAppPackage);
   if (is_pinned()) {
     shelf_delegate()->PinAppWithID(app_id);
-    EXPECT_TRUE(shelf_delegate()->GetShelfIDForAppID(app_id));
+    const ash::ShelfID shelf_id = shelf_delegate()->GetShelfIDForAppID(app_id);
+    EXPECT_TRUE(shelf_id);
+    const ash::ShelfItem* item = chrome_controller()->GetItem(shelf_id);
+    EXPECT_EQ(base::UTF8ToUTF16(kTestAppName), item->title);
   } else {
     EXPECT_FALSE(shelf_delegate()->GetShelfIDForAppID(app_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);
   if (is_pinned())
     EXPECT_TRUE(shelf_delegate()->GetShelfIDForAppID(app_id));
   else
     EXPECT_FALSE(shelf_delegate()->GetShelfIDForAppID(app_id));
 
   // Launching non-ready Arc app creates item on shelf and spinning animation.
   arc::LaunchApp(profile(), app_id, ui::EF_LEFT_MOUSE_BUTTON);
-  EXPECT_TRUE(shelf_delegate()->GetShelfIDForAppID(app_id));
+  const ash::ShelfID shelf_id = shelf_delegate()->GetShelfIDForAppID(app_id);
+  EXPECT_TRUE(shelf_id);
+  const ash::ShelfItem* item = chrome_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()
@@ skipping 192 matching lines @@
   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::ArcSessionManager::Get()->DisableArc();
   EXPECT_FALSE(GetAppItemController(shelf_id3));
 }