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

chrome/browser/ui/ash/launcher/launcher_controller_helper.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 "chrome/browser/ui/ash/launcher/launcher_controller_helper.h"
 
 #include <vector>
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/arc/arc_support_host.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/launch_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.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_window_launcher_controller.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/extensions/app_launch_params.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/browser/ui/extensions/extension_enable_flow.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
@@ skipping 67 matching lines @@
 
 LauncherControllerHelper::LauncherControllerHelper(Profile* profile)
     : profile_(profile) {}
 
 LauncherControllerHelper::~LauncherControllerHelper() {}
 
 // static
 base::string16 LauncherControllerHelper::GetAppTitle(
     Profile* profile,
     const std::string& app_id) {
-  base::string16 title;
   if (app_id.empty())
-    return title;
+    return base::string16();
 
-  // Get title if the app is an Arc app.
+  // Get the title if the app is an Arc app.
   ArcAppListPrefs* arc_prefs = ArcAppListPrefs::Get(profile);
-  if (arc_prefs && arc_prefs->IsRegistered(app_id)) {
+  const std::string arc_app_id =
+      ArcAppWindowLauncherController::GetArcAppIdFromShelfAppId(app_id);

[James Cook, 2017/01/11 01:23:38]

So before the |app_id| was sometimes a shelf app id and sometimes an arc id?

[msw, 2017/01/11 02:17:31]

Not sure I understand your question exactly, but that function just maps the
Play Store app to the Arc platform host app, so it should be safe regardless.
The two arc item controller classes called it in their GetTitle overrides, I
believe adding it here is fixing a minor/trivial defect, but I'm not sure if
GetAppTitle was actually used for arc apps before my change.

+  if (arc_prefs && arc_prefs->IsRegistered(arc_app_id)) {
     std::unique_ptr<ArcAppListPrefs::AppInfo> app_info =
-        arc_prefs->GetApp(app_id);
+        arc_prefs->GetApp(arc_app_id);
     DCHECK(app_info.get());
     if (app_info)
-      title = base::UTF8ToUTF16(app_info->name);
-    return title;
+      return base::UTF8ToUTF16(app_info->name);
   }
 
   const extensions::Extension* extension = GetExtensionByID(profile, app_id);
   if (extension)
-    title = base::UTF8ToUTF16(extension->name());
-  return title;
+    return base::UTF8ToUTF16(extension->name());
+  return base::string16();
 }
 
 std::string LauncherControllerHelper::GetAppID(content::WebContents* tab) {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   if (profile_manager) {
     const std::vector<Profile*> profile_list =
         profile_manager->GetLoadedProfiles();
     if (!profile_list.empty()) {
       for (auto* i : profile_list) {
         const extensions::Extension* extension = GetExtensionForTab(i, tab);
@@ skipping 88 matching lines @@
 
 void LauncherControllerHelper::ExtensionEnableFlowFinished() {
   LaunchApp(extension_enable_flow_->extension_id(), ash::LAUNCH_FROM_UNKNOWN,
             ui::EF_NONE);
   extension_enable_flow_.reset();
 }
 
 void LauncherControllerHelper::ExtensionEnableFlowAborted(bool user_initiated) {
   extension_enable_flow_.reset();
 }