Index: chrome/browser/automation/testing_automation_provider.cc |
=================================================================== |
--- chrome/browser/automation/testing_automation_provider.cc (revision 113069) |
+++ chrome/browser/automation/testing_automation_provider.cc (working copy) |
@@ -4379,8 +4379,8 @@ |
} |
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 ExtensionList* extensions = service->extensions(); |
+ const ExtensionList* disabled_extensions = service->disabled_extensions(); |
ExtensionList all; |
all.insert(all.end(), |
extensions->begin(), |
Property changes on: chrome/browser/automation/testing_automation_provider.cc |
___________________________________________________________________ |
Added: svn:mergeinfo |