GetEnabledExtensions should also return Loaded Extensions.

We use to not need them since we would simply overinstall them all the time.
But now that overinstall is allowed and reset the extension state (e.g., close and reopen the background page), we can't simply install exploded extensions at will anymore, we must first check if it was already installed or not (which means GetEnabledExtensions must return them) and only install them when they are not already there.

BUG=0
TEST=none

Review URL: http://codereview.chromium.org/2303004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48400 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 2 deletions

diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index eb165e1..dd1a07b 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -1395,7 +1395,9 @@ void AutomationProvider::GetBookmarkBarVisibility(int handle,
   if (browser_tracker_->ContainsHandle(handle)) {
     Browser* browser = browser_tracker_->GetResource(handle);
     if (browser) {
-#if 0 // defined(TOOLKIT_VIEWS) && defined(OS_LINUX)
+#if 0  // defined(TOOLKIT_VIEWS) && defined(OS_LINUX)
+      // TODO(jrg): Was removed in rev43789 for perf. Need to investigate.
+
       // IsBookmarkBarVisible() line looks correct but is not
       // consistent across platforms.  Specifically, on Mac/Linux, it
       // returns false if the bar is hidden in a pref (even if visible
@@ -3300,7 +3302,8 @@ void AutomationProvider::GetEnabledExtensions(
     for (size_t i = 0; i < extensions->size(); ++i) {
       Extension* extension = (*extensions)[i];
       DCHECK(extension);
-      if (extension->location() == Extension::INTERNAL) {
+      if (extension->location() == Extension::INTERNAL ||
+          extension->location() == Extension::LOAD) {
         result->push_back(extension->path());
       }
     }