RefCounted types should not have public destructors, component_updater edition

BUG=123295
TEST=existing


Review URL: https://chromiumcodereview.appspot.com/10414019

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

2 files changed, 9 insertions, 7 deletions

diff --git a/chrome/browser/component_updater/component_updater_service.h b/chrome/browser/component_updater/component_updater_service.h
index cf59ad2..abe1dc2 100644
--- a/chrome/browser/component_updater/component_updater_service.h
+++ b/chrome/browser/component_updater/component_updater_service.h
@@ -27,8 +27,6 @@ class DictionaryValue;
 // given to ComponentUpdateService::RegisterComponent().
 class ComponentInstaller {
  public :
-  virtual ~ComponentInstaller() {}
-
   // Called by the component updater on the UI thread when there was a
   // problem unpacking or verifying the component. |error| is a non-zero
   // value which is only meaninful to the component updater.
@@ -40,6 +38,9 @@ class ComponentInstaller {
   // with all the unpacked CRX files.
   virtual bool Install(base::DictionaryValue* manifest,
                        const FilePath& unpack_path) = 0;
+
+ protected:
+  virtual ~ComponentInstaller() {}
 };
 
 // Describes a particular component that can be installed or updated. This
diff --git a/chrome/browser/component_updater/component_updater_service_unittest.cc b/chrome/browser/component_updater/component_updater_service_unittest.cc
index fd38931..49bf3c5 100644
--- a/chrome/browser/component_updater/component_updater_service_unittest.cc
+++ b/chrome/browser/component_updater/component_updater_service_unittest.cc
@@ -186,8 +186,8 @@ class ComponentUpdaterTest : public testing::Test {
   }
 
   void RegisterComponent(CrxComponent* com,
-                       TestComponents component,
-                       const Version& version) {
+                         TestComponents component,
+                         const Version& version) {
     if (component == kTestComponent_abag) {
       com->name = "test_abag";
       com->pk_hash.assign(abag_hash, abag_hash + arraysize(abag_hash));
@@ -196,8 +196,9 @@ class ComponentUpdaterTest : public testing::Test {
       com->pk_hash.assign(jebg_hash, jebg_hash + arraysize(jebg_hash));
     }
     com->version = version;
-    com->installer = new TestInstaller;
-    test_installers_.push_back(com->installer);
+    TestInstaller* installer = new TestInstaller;
+    com->installer = installer;
+    test_installers_.push_back(installer);
     component_updater_->RegisterComponent(*com);
   }
 
@@ -207,7 +208,7 @@ class ComponentUpdaterTest : public testing::Test {
   TestNotificationTracker notification_tracker_;
   TestConfigurator* test_config_;
   // ComponentInstaller objects to delete after each test.
-  ScopedVector<ComponentInstaller> test_installers_;
+  ScopedVector<TestInstaller> test_installers_;
 };
 
 // Verify that our test fixture work and the component updater can