| Index: chrome/browser/task_manager/task_manager.cc
|
| diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc
|
| index b062ec61444ec07adfed2cc7a063dd7af395347e..7786948e24960a729f434a03153a6410191c7489 100644
|
| --- a/chrome/browser/task_manager/task_manager.cc
|
| +++ b/chrome/browser/task_manager/task_manager.cc
|
| @@ -16,7 +16,6 @@
|
| #include "base/strings/stringprintf.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "chrome/browser/browser_process.h"
|
| -#include "chrome/browser/extensions/extension_process_manager.h"
|
| #include "chrome/browser/extensions/extension_system.h"
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| #include "chrome/browser/task_manager/background_resource_provider.h"
|
| @@ -39,6 +38,7 @@
|
| #include "content/public/browser/web_contents.h"
|
| #include "content/public/browser/web_contents_delegate.h"
|
| #include "content/public/common/result_codes.h"
|
| +#include "extensions/browser/process_manager.h"
|
| #include "grit/generated_resources.h"
|
| #include "grit/ui_resources.h"
|
| #include "third_party/icu/source/i18n/unicode/coll.h"
|
| @@ -157,15 +157,17 @@ void GetWinUSERHandles(base::ProcessHandle process,
|
| // Counts the number of extension background pages associated with this profile.
|
| int CountExtensionBackgroundPagesForProfile(Profile* profile) {
|
| int count = 0;
|
| - ExtensionProcessManager* manager =
|
| + extensions::ProcessManager* manager =
|
| extensions::ExtensionSystem::Get(profile)->process_manager();
|
| if (!manager)
|
| return count;
|
|
|
| - const ExtensionProcessManager::ExtensionHostSet& background_hosts =
|
| + const extensions::ProcessManager::ExtensionHostSet& background_hosts =
|
| manager->background_hosts();
|
| - for (ExtensionProcessManager::const_iterator iter = background_hosts.begin();
|
| - iter != background_hosts.end(); ++iter) {
|
| + for (extensions::ProcessManager::const_iterator iter =
|
| + background_hosts.begin();
|
| + iter != background_hosts.end();
|
| + ++iter) {
|
| ++count;
|
| }
|
| return count;
|
|
|