3 files changed, 20 insertions, 0 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index 998b252..8ae593b 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -484,6 +484,8 @@ void AutomationProvider::OnMessageReceived(const IPC::Message& message) {
                                     InstallExtension)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(AutomationMsg_LoadExpandedExtension,
                                     LoadExpandedExtension)
+    IPC_MESSAGE_HANDLER(AutomationMsg_GetEnabledExtensions,
+                        GetEnabledExtensions)
     IPC_MESSAGE_HANDLER(AutomationMsg_ShutdownSessionService,
                         ShutdownSessionService)
     IPC_MESSAGE_HANDLER(AutomationMsg_SaveAsAsync, SaveAsAsync)
@@ -2482,6 +2484,21 @@ void AutomationProvider::LoadExpandedExtension(
   }
 }
 
+void AutomationProvider::GetEnabledExtensions(
+    std::vector<FilePath>* result) {
+  ExtensionsService* service = profile_->GetExtensionsService();
+  DCHECK(service);
+  if (service->extensions_enabled()) {
+    const ExtensionList* extensions = service->extensions();
+    DCHECK(extensions);
+    for (size_t i = 0; i < extensions->size(); ++i) {
+      Extension* extension = (*extensions)[i];
+      DCHECK(extension);
+      result->push_back(extension->path());
+    }
+  }
+}
+
 void AutomationProvider::SaveAsAsync(int tab_handle) {
   NavigationController* tab = NULL;
   TabContents* tab_contents = GetTabContentsForHandle(tab_handle, &tab);
diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h
index 88bb865..e5b36bf 100644
--- a/chrome/browser/automation/automation_provider.h
+++ b/chrome/browser/automation/automation_provider.h
@@ -363,6 +363,8 @@ class AutomationProvider : public base::RefCounted<AutomationProvider>,
   void LoadExpandedExtension(const FilePath& extension_dir,
                              IPC::Message* reply_message);
 
+  void GetEnabledExtensions(std::vector<FilePath>* result);
+
   void NavigateInExternalTab(
       int handle, const GURL& url, const GURL& referrer,
       AutomationMsg_NavigationResponseValues* status);
diff --git a/chrome/browser/automation/chrome_frame_automation_provider.cc b/chrome/browser/automation/chrome_frame_automation_provider.cc
index ab87b92..c8bada3 100644
--- a/chrome/browser/automation/chrome_frame_automation_provider.cc
+++ b/chrome/browser/automation/chrome_frame_automation_provider.cc
@@ -45,6 +45,7 @@ bool ChromeFrameAutomationProvider::IsValidMessage(uint32 type) {
     case AutomationMsg_Find::ID:
     case AutomationMsg_InstallExtension::ID:
     case AutomationMsg_LoadExpandedExtension::ID:
+    case AutomationMsg_GetEnabledExtensions::ID:
     case AutomationMsg_SetEnableExtensionAutomation::ID:
     case AutomationMsg_SetInitialFocus::ID:
     case AutomationMsg_SetPageFontSize::ID: