Fix various TaskManager bugs and add new enhancements

chrome/browser/task_management/providers/web_contents/renderer_task.cc

 // Copyright 2015 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/task_management/providers/web_contents/renderer_task.h"
 
 #include "base/i18n/rtl.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/favicon/favicon_utils.h"
 #include "chrome/browser/process_resource_usage.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/profiles/profile_info_cache.h"
-#include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/task_management/task_manager_observer.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/service_registry.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace task_management {
 
@@ skipping 11 matching lines @@
     service_registry->ConnectToRemoteService(mojo::GetProxy(&service));
   return new ProcessResourceUsage(service.Pass());
 }
 
 // Gets the profile name associated with the browser context of the given
 // |render_process_host| from the profile info cache.
 base::string16 GetRendererProfileName(
     const content::RenderProcessHost* render_process_host) {
   Profile* profile =
       Profile::FromBrowserContext(render_process_host->GetBrowserContext());
-  DCHECK(profile);
-  ProfileInfoCache& cache =
-      g_browser_process->profile_manager()->GetProfileInfoCache();
-  size_t index =
-      cache.GetIndexOfProfileWithPath(profile->GetOriginalProfile()->GetPath());
-  if (index != std::string::npos)
-    return cache.GetNameOfProfileAtIndex(index);
-
-  return base::string16();
+  return Task::GetProfileNameFromProfile(profile);
 }
 
 inline bool IsRendererResourceSamplingDisabled(int64 flags) {
   return (flags & (REFRESH_TYPE_V8_MEMORY | REFRESH_TYPE_WEBCACHE_STATS)) == 0;
 }
 
 }  // namespace
 
 RendererTask::RendererTask(const base::string16& title,
                            const gfx::ImageSkia* icon,
@@ skipping 152 matching lines @@
     if (is_incognito)
       message_id = IDS_TASK_MANAGER_EXTENSION_INCOGNITO_PREFIX;
     else
       message_id = IDS_TASK_MANAGER_EXTENSION_PREFIX;
   }
 
   return l10n_util::GetStringFUTF16(message_id, title);
 }
 
 }  // namespace task_management