Resubmit: Remove ExtensionService Garbage-Collecting methods.

chrome/common/extensions/extension_file_util_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/extensions/extension_file_util.h"
 
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/path_service.h"
@@ skipping 65 matching lines @@
   base::FilePath version_3 = extension_file_util::InstallExtension(
       src,
       extension_id,
       version,
       all_extensions);
   ASSERT_EQ(version_3.value(),
             all_extensions.AppendASCII(extension_id).AppendASCII("1.0_2")
                 .value());
   ASSERT_TRUE(base::DirectoryExists(version_3));
 
-  // Collect garbage. Should remove first one.
-  std::multimap<std::string, base::FilePath> extension_paths;
-  extension_paths.insert(std::make_pair(extension_id,
-      base::FilePath().AppendASCII(extension_id).Append(version_2.BaseName())));
-  extension_paths.insert(std::make_pair(extension_id,
-      base::FilePath().AppendASCII(extension_id).Append(version_3.BaseName())));
-  extension_file_util::GarbageCollectExtensions(all_extensions,
-                                                extension_paths,
-                                                true);
-  ASSERT_FALSE(base::DirectoryExists(version_1));
-  ASSERT_TRUE(base::DirectoryExists(version_2));
-  ASSERT_TRUE(base::DirectoryExists(version_3));
-
   // Uninstall. Should remove entire extension subtree.
   extension_file_util::UninstallExtension(all_extensions, extension_id);
+  ASSERT_FALSE(base::DirectoryExists(version_1.DirName()));
   ASSERT_FALSE(base::DirectoryExists(version_2.DirName()));
   ASSERT_FALSE(base::DirectoryExists(version_3.DirName()));
   ASSERT_TRUE(base::DirectoryExists(all_extensions));
 }
 
 TEST_F(ExtensionFileUtilTest, LoadExtensionWithValidLocales) {
   base::FilePath install_dir;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &install_dir));
   install_dir = install_dir.AppendASCII("extensions")
       .AppendASCII("good")
@@ skipping 349 matching lines @@
   scoped_refptr<Extension> extension3(extension_file_util::LoadExtension(
       ext_dir, Manifest::UNPACKED, Extension::NO_FLAGS, &error));
   EXPECT_TRUE(extension3.get() == NULL);
   EXPECT_STREQ("Could not load icon 'icon.png' for page action.",
                error.c_str());
 }
 
 // TODO(aa): More tests as motivation allows. Maybe steal some from
 // ExtensionService? Many of them could probably be tested here without the
 // MessageLoop shenanigans.