Make ComponentInstaller refcounted.

components/component_updater/default_component_installer.cc

 // Copyright 2014 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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
@@ skipping 37 matching lines @@
   task_runner_ = cus->GetSequencedTaskRunner();
 
   if (!installer_traits_) {
     NOTREACHED() << "A DefaultComponentInstaller has been created but "
                  << "has no installer traits.";
     return;
   }
   task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&DefaultComponentInstaller::StartRegistration,
-                 base::Unretained(this),
-                 cus));
+                 this, cus));
 }
 
 void DefaultComponentInstaller::OnUpdateError(int error) {
   NOTREACHED() << "Component update error: " << error;
 }
 
 bool DefaultComponentInstaller::InstallHelper(
     const base::DictionaryValue& manifest,
     const base::FilePath& unpack_path,
     const base::FilePath& install_path) {
@@ skipping 26 matching lines @@
     return false;
   }
   current_version_ = version;
   // TODO(ddorwin): Change the parameter to scoped_ptr<base::DictionaryValue>
   // so we can avoid this DeepCopy.
   current_manifest_.reset(manifest.DeepCopy());
   scoped_ptr<base::DictionaryValue> manifest_copy(
       current_manifest_->DeepCopy());
   main_task_runner_->PostTask(
       FROM_HERE,
-      base::Bind(&ComponentInstallerTraits::ComponentReady,
-                 base::Unretained(installer_traits_.get()),
-                 current_version_,
-                 GetInstallDirectory(),
-                 base::Passed(&manifest_copy)));
+      base::Bind(&DefaultComponentInstaller::ComponentReady,
+                 this, base::Passed(&manifest_copy)));
   return true;
 }
 
 bool DefaultComponentInstaller::GetInstalledFile(
     const std::string& file,
     base::FilePath* installed_file) {
   if (current_version_.Equals(base::Version(kNullVersion)))
     return false;  // No component has been installed yet.
 
   *installed_file = installer_traits_->GetBaseDirectory()
@@ skipping 69 matching lines @@
   }
 
   // Remove older versions of the component. None should be in use during
   // browser startup.
   for (const auto& older_path : older_paths)
     base::DeleteFile(older_path, true);
 
   main_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&DefaultComponentInstaller::FinishRegistration,
-                 base::Unretained(this),
-                 cus));
+                 this, cus));
 }
 
 base::FilePath DefaultComponentInstaller::GetInstallDirectory() {
   return installer_traits_->GetBaseDirectory()
       .AppendASCII(current_version_.GetString());
 }
 
 void DefaultComponentInstaller::FinishRegistration(
     ComponentUpdateService* cus) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 11 matching lines @@
                    << installer_traits_->GetName();
       return;
     }
   }
 
   if (!current_manifest_)
     return;
 
   scoped_ptr<base::DictionaryValue> manifest_copy(
       current_manifest_->DeepCopy());
+  ComponentReady(manifest_copy.Pass());
+}
+
+void DefaultComponentInstaller::ComponentReady(
+    scoped_ptr<base::DictionaryValue> manifest) {
   installer_traits_->ComponentReady(
-      current_version_, GetInstallDirectory(), manifest_copy.Pass());
+      current_version_, GetInstallDirectory(), manifest.Pass());
 }
 
 }  // namespace component_updater