ExtensionsServiceBackend::GarbageCollectionExtensions() makes a local copy of...

ExtensionsServiceBackend::GarbageCollectionExtensions() makes a local copy of install_directory_. It was forcing the persistent copy to an absolute path which was causing the ExternsionsService and ExtensionsPrefs install_directory_ values to diverge.

Re-enable ExternalInstallPref on mac.

TBR=mpcomplete

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

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

chrome/browser/extensions/extensions_service.cc

@@ -559,14 +559,15 @@ void ExtensionsServiceBackend::GarbageCollectExtensions(
   // Nothing to clean up if it doesn't exist.
   if (!file_util::DirectoryExists(install_directory_))
     return;
-
-  file_util::AbsolutePath(&install_directory_);
+  
+  FilePath install_directory_absolute(install_directory_);
+  file_util::AbsolutePath(&install_directory_absolute);
 
   LOG(INFO) << "Loading installed extensions...";
 
   // Find all child directories in the install directory and load their
   // manifests. Post errors and results to the frontend.
-  file_util::FileEnumerator enumerator(install_directory_,
+  file_util::FileEnumerator enumerator(install_directory_absolute,
                                        false,  // Not recursive.
                                        file_util::FileEnumerator::DIRECTORIES);
   FilePath extension_path;

chrome/browser/extensions/extensions_service_unittest.cc

@@ -1227,10 +1227,6 @@ TEST_F(ExtensionsServiceTest, ExternalInstallRegistry) {
 
 #endif
 
-// TODO(rafaelw): Re-enable on mac. This broke with:
-// http://codereview.chromium.org/140018
-#if !defined(OS_MACOSX)
-
 TEST_F(ExtensionsServiceTest, ExternalInstallPref) {
   InitializeEmptyExtensionsService();
   // Verify that starting with no providers loads no extensions.
@@ -1344,8 +1340,6 @@ TEST_F(ExtensionsServiceTest, ExternalInstallPref) {
               std::string::npos);
 }
 
-#endif  // !defined(OS_MACOSX)
-
 TEST_F(ExtensionsServiceTest, ExternalPrefProvider) {
   InitializeEmptyExtensionsService();
   std::string json_data =