| 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 dc3d02ffb76339fbd264d03c3e5deade5f3cb7ef..3764f6da59843c9159a3cbd19aa21e40b7eb8daf 100644
|
| --- a/chrome/browser/automation/testing_automation_provider.cc
|
| +++ b/chrome/browser/automation/testing_automation_provider.cc
|
| @@ -183,6 +183,8 @@ using content::Referrer;
|
| using content::RenderViewHost;
|
| using content::SSLStatus;
|
| using content::WebContents;
|
| +using extensions::Extension;
|
| +using extensions::ExtensionList;
|
|
|
| namespace {
|
|
|
| @@ -4523,9 +4525,8 @@ ListValue* GetAPIPermissions(const Extension* ext) {
|
| // Sample json input: { "command": "GetExtensionsInfo" }
|
| // See GetExtensionsInfo() in chrome/test/pyautolib/pyauto.py for sample json
|
| // output.
|
| -void TestingAutomationProvider::GetExtensionsInfo(
|
| - DictionaryValue* args,
|
| - IPC::Message* reply_message) {
|
| +void TestingAutomationProvider::GetExtensionsInfo(DictionaryValue* args,
|
| + IPC::Message* reply_message) {
|
| AutomationJSONReply reply(this, reply_message);
|
| Browser* browser;
|
| std::string error_msg;
|
| @@ -4571,9 +4572,11 @@ void TestingAutomationProvider::GetExtensionsInfo(
|
| Extension::Location location = extension->location();
|
| extension_value->SetBoolean("is_component",
|
| location == Extension::COMPONENT);
|
| - extension_value->SetBoolean("is_internal", location == Extension::INTERNAL);
|
| + extension_value->SetBoolean("is_internal",
|
| + location == Extension::INTERNAL);
|
| extension_value->SetBoolean("is_user_installed",
|
| - location == Extension::INTERNAL || location == Extension::LOAD);
|
| + location == Extension::INTERNAL ||
|
| + location == Extension::LOAD);
|
| extension_value->SetBoolean("is_enabled", service->IsExtensionEnabled(id));
|
| extension_value->SetBoolean("allowed_in_incognito",
|
| service->IsIncognitoEnabled(id));
|
| @@ -4676,7 +4679,8 @@ void TestingAutomationProvider::SetExtensionStateById(
|
| AutomationJSONReply(this, reply_message).SendSuccess(NULL);
|
| }
|
| } else {
|
| - service->DisableExtension(extension->id(), Extension::DISABLE_USER_ACTION);
|
| + service->DisableExtension(extension->id(),
|
| + Extension::DISABLE_USER_ACTION);
|
| AutomationJSONReply(this, reply_message).SendSuccess(NULL);
|
| }
|
|
|
|
|