| Index: chrome/browser/managed_mode/managed_user_service.cc
|
| diff --git a/chrome/browser/managed_mode/managed_user_service.cc b/chrome/browser/managed_mode/managed_user_service.cc
|
| index 530d14fe957cbefd933c8a9ff96d12a4b6054c84..71706227b2c0d28eb63d0f10175e95566272da3f 100644
|
| --- a/chrome/browser/managed_mode/managed_user_service.cc
|
| +++ b/chrome/browser/managed_mode/managed_user_service.cc
|
| @@ -34,12 +34,12 @@
|
| #include "chrome/browser/ui/browser_list.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/extensions/api/managed_mode_private/managed_mode_handler.h"
|
| -#include "chrome/common/extensions/extension_set.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "components/user_prefs/pref_registry_syncable.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/notification_details.h"
|
| #include "content/public/browser/notification_source.h"
|
| +#include "extensions/common/extension_set.h"
|
| #include "google_apis/gaia/google_service_auth_error.h"
|
| #include "grit/generated_resources.h"
|
| #include "net/base/escape.h"
|
| @@ -409,8 +409,8 @@ ScopedVector<ManagedModeSiteList> ManagedUserService::GetActiveSiteLists() {
|
| if (!extension_service)
|
| return site_lists.Pass();
|
|
|
| - const ExtensionSet* extensions = extension_service->extensions();
|
| - for (ExtensionSet::const_iterator it = extensions->begin();
|
| + const extensions::ExtensionSet* extensions = extension_service->extensions();
|
| + for (extensions::ExtensionSet::const_iterator it = extensions->begin();
|
| it != extensions->end(); ++it) {
|
| const extensions::Extension* extension = it->get();
|
| if (!extension_service->IsExtensionEnabled(extension->id()))
|
|
|