| Index: chrome/browser/automation/testing_automation_provider.cc
|
| diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
|
| index 527dd71a90b44dfadefc8bb4b91de3e29c259a71..3844420bed2112b6596be0109e9e9597bdb5c9dd 100644
|
| --- a/chrome/browser/automation/testing_automation_provider.cc
|
| +++ b/chrome/browser/automation/testing_automation_provider.cc
|
| @@ -140,6 +140,7 @@
|
| #include "extensions/browser/process_manager.h"
|
| #include "extensions/browser/view_type_utils.h"
|
| #include "extensions/common/extension.h"
|
| +#include "extensions/common/extension_set.h"
|
| #include "extensions/common/manifest_handlers/background_info.h"
|
| #include "extensions/common/permissions/permission_set.h"
|
| #include "extensions/common/permissions/permissions_data.h"
|
| @@ -3535,8 +3536,9 @@ void TestingAutomationProvider::GetExtensionsInfo(DictionaryValue* args,
|
| }
|
| scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
|
| ListValue* extensions_values = new ListValue;
|
| - const ExtensionSet* extensions = service->extensions();
|
| - const ExtensionSet* disabled_extensions = service->disabled_extensions();
|
| + const extensions::ExtensionSet* extensions = service->extensions();
|
| + const extensions::ExtensionSet* disabled_extensions =
|
| + service->disabled_extensions();
|
| ExtensionList all;
|
| all.insert(all.end(),
|
| extensions->begin(),
|
|
|