Allow extension overinstall

chrome/browser/extensions/extensions_service_unittest.cc

 // Copyright (c) 2009 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/browser/extensions/extensions_service_unittest.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 951 matching lines @@
   ASSERT_EQ(1u, loaded_.size());
   ASSERT_EQ(0u, GetErrors().size());
   ValidatePrefKeyCount(1);
   ValidateIntegerPref(good_crx, L"state", Extension::ENABLED);
   ValidateIntegerPref(good_crx, L"location", Extension::INTERNAL);
 
   installed_ = NULL;
   loaded_.clear();
   ExtensionErrorReporter::GetInstance()->ClearErrors();
 
-  // Reinstall the same version, nothing should happen.
+  // Reinstall the same version, it should overwrite the previous one.
   service_->InstallExtension(path);
   loop_.RunAllPending();
 
-  ASSERT_FALSE(installed_);
-  ASSERT_EQ(0u, loaded_.size());
+  ASSERT_TRUE(installed_);
+  ASSERT_EQ(1u, loaded_.size());
   ASSERT_EQ(0u, GetErrors().size());
   ValidatePrefKeyCount(1);
   ValidateIntegerPref(good_crx, L"state", Extension::ENABLED);
   ValidateIntegerPref(good_crx, L"location", Extension::INTERNAL);
 }
 
 // Test upgrading a signed extension.
 TEST_F(ExtensionsServiceTest, UpgradeSignedGood) {
   InitializeEmptyExtensionsService();
   FilePath extensions_path;
@@ skipping 223 matching lines @@
   Extension* good = service_->extensions()->at(0);
 
   // Use AddPendingExtensionInternal() as AddPendingExtension() would
   // balk.
   service_->AddPendingExtensionInternal(
       good->id(), good->update_url(), *good->version(),
       good->IsTheme(), kGoodInstallSilently);
 
   UpdateExtension(good->id(), path, true, true, false);
 
-  EXPECT_TRUE(ContainsKey(service_->pending_extensions(), kGoodId));
+  EXPECT_FALSE(ContainsKey(service_->pending_extensions(), kGoodId));
 }
 
 // Test pref settings for blacklist and unblacklist extensions.
 TEST_F(ExtensionsServiceTest, SetUnsetBlacklistInPrefs) {
   InitializeEmptyExtensionsService();
   std::vector<std::string> blacklist;
   blacklist.push_back(good0);
   blacklist.push_back("invalid_id");  // an invalid id
   blacklist.push_back(good1);
   service_->UpdateExtensionBlacklist(blacklist);
@@ skipping 674 matching lines @@
   // Component extensions shouldn't get recourded in the prefs.
   ValidatePrefKeyCount(0);
 
   // Reload all extensions, and make sure it comes back.
   std::string extension_id = service_->extensions()->at(0)->id();
   loaded_.clear();
   service_->ReloadExtensions();
   ASSERT_EQ(1u, service_->extensions()->size());
   EXPECT_EQ(extension_id, service_->extensions()->at(0)->id());
 }