Make ComponentInstaller refcounted.

chrome/browser/component_updater/test/component_updater_service_unittest.cc

 // Copyright 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/browser/component_updater/test/component_updater_service_unittest.h"
 
 #include <vector>
 
 #include "base/files/file_util.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 98 matching lines @@
 }
 
 TestConfigurator* ComponentUpdaterTest::test_configurator() {
   return test_config_;
 }
 
 ComponentUpdateService::Status ComponentUpdaterTest::RegisterComponent(
     CrxComponent* com,
     TestComponents component,
     const Version& version,
-    TestInstaller* installer) {
-  if (component == kTestComponent_abag) {
-    com->name = "test_abag";
-    com->pk_hash.assign(abag_hash, abag_hash + arraysize(abag_hash));
-  } else if (component == kTestComponent_jebg) {
-    com->name = "test_jebg";
-    com->pk_hash.assign(jebg_hash, jebg_hash + arraysize(jebg_hash));
-  } else {
-    com->name = "test_ihfo";
-    com->pk_hash.assign(ihfo_hash, ihfo_hash + arraysize(ihfo_hash));
+    const scoped_refptr<TestInstaller>& installer) {
+  switch (component) {
+    case kTestComponent_abag: {
+      com->name = "test_abag";
+      com->pk_hash.assign(abag_hash, abag_hash + arraysize(abag_hash));
+      break;
+    }
+    case kTestComponent_jebg: {
+      com->name = "test_jebg";
+      com->pk_hash.assign(jebg_hash, jebg_hash + arraysize(jebg_hash));
+      break;
+    }
+    case kTestComponent_ihfo: {
+      com->name = "test_ihfo";
+      com->pk_hash.assign(ihfo_hash, ihfo_hash + arraysize(ihfo_hash));
+      break;
+    }
   }
   com->version = version;
   com->installer = installer;
   return component_updater_->RegisterComponent(*com);
 }
 
 void ComponentUpdaterTest::RunThreads() {
   base::RunLoop runloop;
   test_configurator()->SetQuitClosure(runloop.QuitClosure());
   runloop.Run();
@@ skipping 44 matching lines @@
   EXPECT_CALL(observer,
               OnEvent(ServiceObserver::COMPONENT_NOT_UPDATED,
                       "abagagagagagagagagagagagagagagag"))
       .Times(2);
 
   EXPECT_TRUE(post_interceptor_->ExpectRequest(
       new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
   EXPECT_TRUE(post_interceptor_->ExpectRequest(
       new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
 
-  TestInstaller installer;
+  scoped_refptr<TestInstaller> installer(new TestInstaller);
   CrxComponent com;
   component_updater()->AddObserver(&observer);
   EXPECT_EQ(
       ComponentUpdateService::kOk,
-      RegisterComponent(&com, kTestComponent_abag, Version("1.1"), &installer));
+      RegisterComponent(&com, kTestComponent_abag, Version("1.1"), installer));
 
   // We loop twice, but there are no updates so we expect two sleep messages.
   test_configurator()->SetLoopCount(2);
   component_updater()->Start();
   RunThreads();
 
-  EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->error());
-  EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->install_count());
+  EXPECT_EQ(0, installer->error());
+  EXPECT_EQ(0, installer->install_count());
 
   // Expect to see the two update check requests and no other requests,
   // including pings.
   EXPECT_EQ(2, post_interceptor_->GetHitCount())
       << post_interceptor_->GetRequestsAsString();
   EXPECT_EQ(2, post_interceptor_->GetCount())
       << post_interceptor_->GetRequestsAsString();
   EXPECT_NE(
       string::npos,
       post_interceptor_->GetRequests()[0].find(
@@ skipping 24 matching lines @@
   post_interceptor_->Reset();
   EXPECT_TRUE(post_interceptor_->ExpectRequest(
       new PartialMatch("updatecheck"), test_file("updatecheck_reply_empty")));
   EXPECT_TRUE(post_interceptor_->ExpectRequest(
       new PartialMatch("updatecheck"), test_file("updatecheck_reply_empty")));
 
   test_configurator()->SetLoopCount(2);
   component_updater()->Start();
   RunThreads();
 
-  EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->error());
-  EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->install_count());
+  EXPECT_EQ(0, installer->error());
+  EXPECT_EQ(0, installer->install_count());
 
   EXPECT_EQ(2, post_interceptor_->GetHitCount())
       << post_interceptor_->GetRequestsAsString();
   EXPECT_EQ(2, post_interceptor_->GetCount())
       << post_interceptor_->GetRequestsAsString();
   EXPECT_NE(
       string::npos,
       post_interceptor_->GetRequests()[0].find(
           "<app appid=\"abagagagagagagagagagagagagagagag\" version=\"1.1\">"
           "<updatecheck /></app>"))
@@ skipping 65 matching lines @@
   EXPECT_TRUE(post_interceptor_->ExpectRequest(new PartialMatch("event")));
   EXPECT_TRUE(post_interceptor_->ExpectRequest(
       new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
 
   get_interceptor_->SetResponse(
       GURL(expected_crx_url),
       test_file("jebgalgnebhfojomionfpkfelancnnkf.crx"));
 
   component_updater()->AddObserver(&observer);
 
-  TestInstaller installer1;
+  scoped_refptr<TestInstaller> installer1(new TestInstaller);
   CrxComponent com1;
-  RegisterComponent(&com1, kTestComponent_jebg, Version("0.9"), &installer1);
-  TestInstaller installer2;
+  RegisterComponent(&com1, kTestComponent_jebg, Version("0.9"), installer1);
+  scoped_refptr<TestInstaller> installer2(new TestInstaller);
   CrxComponent com2;
-  RegisterComponent(&com2, kTestComponent_abag, Version("2.2"), &installer2);
+  RegisterComponent(&com2, kTestComponent_abag, Version("2.2"), installer2);
 
   test_configurator()->SetLoopCount(2);
   component_updater()->Start();
   RunThreads();
 
-  EXPECT_EQ(0, static_cast<TestInstaller*>(com1.installer)->error());
-  EXPECT_EQ(1, static_cast<TestInstaller*>(com1.installer)->install_count());
-  EXPECT_EQ(0, static_cast<TestInstaller*>(com2.installer)->error());
-  EXPECT_EQ(0, static_cast<TestInstaller*>(com2.installer)->install_count());
+  EXPECT_EQ(0, installer1->error());
+  EXPECT_EQ(1, installer1->install_count());
+  EXPECT_EQ(0, installer2->error());
+  EXPECT_EQ(0, installer2->install_count());
 
   // Expect three request in total: two update checks and one ping.
   EXPECT_EQ(3, post_interceptor_->GetHitCount())
       << post_interceptor_->GetRequestsAsString();
   EXPECT_EQ(3, post_interceptor_->GetCount())
       << post_interceptor_->GetRequestsAsString();
 
   // Expect one component download.
   EXPECT_EQ(1, get_interceptor_->GetHitCount());
 
@@ skipping 70 matching lines @@
 // particular there should not be an install because the minimum product
 // version is much higher than of chrome.
 TEST_F(ComponentUpdaterTest, ProdVersionCheck) {
   EXPECT_TRUE(post_interceptor_->ExpectRequest(
       new PartialMatch("updatecheck"), test_file("updatecheck_reply_2.xml")));
 
   get_interceptor_->SetResponse(
       GURL(expected_crx_url),
       test_file("jebgalgnebhfojomionfpkfelancnnkf.crx"));
 
-  TestInstaller installer;
+  scoped_refptr<TestInstaller> installer(new TestInstaller);
   CrxComponent com;
-  RegisterComponent(&com, kTestComponent_jebg, Version("0.9"), &installer);
+  RegisterComponent(&com, kTestComponent_jebg, Version("0.9"), installer);
 
   test_configurator()->SetLoopCount(1);
   component_updater()->Start();
   RunThreads();
 
   // Expect one update check and no ping.
   EXPECT_EQ(1, post_interceptor_->GetHitCount())
       << post_interceptor_->GetRequestsAsString();
   EXPECT_EQ(1, post_interceptor_->GetCount())
       << post_interceptor_->GetRequestsAsString();
 
   // Expect no download to occur.
   EXPECT_EQ(0, get_interceptor_->GetHitCount());
 
-  EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->error());
-  EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->install_count());
+  EXPECT_EQ(0, installer->error());
+  EXPECT_EQ(0, installer->install_count());
 
   component_updater()->Stop();
 }
 
 // Test that a update check due to an on demand call can cause installs.
 // Here is the timeline:
 //  - First loop: we return a reply that indicates no update, so
 //    nothing happens.
 //  - We make an on demand call.
 //  - This triggers a second loop, which has a reply that triggers an install.
@@ skipping 51 matching lines @@
 
   EXPECT_TRUE(post_interceptor_->ExpectRequest(
       new PartialMatch("updatecheck"), test_file("updatecheck_reply_empty")));
 
   get_interceptor_->SetResponse(
       GURL(expected_crx_url),
       test_file("jebgalgnebhfojomionfpkfelancnnkf.crx"));
 
   component_updater()->AddObserver(&observer);
 
-  TestInstaller installer1;
+  scoped_refptr<TestInstaller> installer1(new TestInstaller);
   CrxComponent com1;
-  RegisterComponent(&com1, kTestComponent_abag, Version("2.2"), &installer1);
-  TestInstaller installer2;
+  RegisterComponent(&com1, kTestComponent_abag, Version("2.2"), installer1);
+  scoped_refptr<TestInstaller> installer2(new TestInstaller);
   CrxComponent com2;
-  RegisterComponent(&com2, kTestComponent_jebg, Version("0.9"), &installer2);
+  RegisterComponent(&com2, kTestComponent_jebg, Version("0.9"), installer2);
 
   // No update normally.
   test_configurator()->SetLoopCount(1);
   component_updater()->Start();
   RunThreads();
   component_updater()->Stop();
 
   EXPECT_EQ(1, post_interceptor_->GetHitCount())
       << post_interceptor_->GetRequestsAsString();
   EXPECT_EQ(1, post_interceptor_->GetCount())
       << post_interceptor_->GetRequestsAsString();
 
   EXPECT_EQ(0, get_interceptor_->GetHitCount());
 
   // Update after an on-demand check is issued.
   post_interceptor_->Reset();
   EXPECT_TRUE(post_interceptor_->ExpectRequest(
       new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
   EXPECT_TRUE(post_interceptor_->ExpectRequest(new PartialMatch("event")));
 
   EXPECT_EQ(
       ComponentUpdateService::kOk,
       OnDemandTester::OnDemand(component_updater(), GetCrxComponentID(com2)));
   test_configurator()->SetLoopCount(1);
   component_updater()->Start();
   RunThreads();
 
-  EXPECT_EQ(0, static_cast<TestInstaller*>(com1.installer)->error());
-  EXPECT_EQ(0, static_cast<TestInstaller*>(com1.installer)->install_count());
-  EXPECT_EQ(0, static_cast<TestInstaller*>(com2.installer)->error());
-  EXPECT_EQ(1, static_cast<TestInstaller*>(com2.installer)->install_count());
+  EXPECT_EQ(0, installer1->error());
+  EXPECT_EQ(0, installer1->install_count());
+  EXPECT_EQ(0, installer2->error());
+  EXPECT_EQ(1, installer2->install_count());
 
   EXPECT_EQ(2, post_interceptor_->GetHitCount())
       << post_interceptor_->GetRequestsAsString();
   EXPECT_EQ(2, post_interceptor_->GetCount())
       << post_interceptor_->GetRequestsAsString();
 
   EXPECT_EQ(1, get_interceptor_->GetHitCount());
 
   // Expect the update check to contain an "ondemand" request for the
   // second component (com2) and a normal request for the other component.
@@ skipping 155 matching lines @@
   EXPECT_TRUE(post_interceptor_->ExpectRequest(new PartialMatch("event")));
   EXPECT_TRUE(post_interceptor_->ExpectRequest(
       new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
 
   get_interceptor_->SetResponse(
       GURL(expected_crx_url),
       test_file("jebgalgnebhfojomionfpkfelancnnkf.crx"));
 
   component_updater()->AddObserver(&observer);
 
-  TestInstaller installer1;
+  scoped_refptr<TestInstaller> installer1(new TestInstaller);
   CrxComponent com1;
-  RegisterComponent(&com1, kTestComponent_jebg, Version("0.9"), &installer1);
-  TestInstaller installer2;
+  RegisterComponent(&com1, kTestComponent_jebg, Version("0.9"), installer1);
+  scoped_refptr<TestInstaller> installer2(new TestInstaller);
   CrxComponent com2;
-  RegisterComponent(&com2, kTestComponent_abag, Version("2.2"), &installer2);
+  RegisterComponent(&com2, kTestComponent_abag, Version("2.2"), installer2);
 
   // Loop twice to issue two checks: (1) with original 0.9 version, update to
   // 1.0, and do the second check (2) with the updated 1.0 version.
   test_configurator()->SetLoopCount(2);
   component_updater()->Start();
   RunThreads();
 
-  EXPECT_EQ(0, static_cast<TestInstaller*>(com1.installer)->error());
-  EXPECT_EQ(1, static_cast<TestInstaller*>(com1.installer)->install_count());
-  EXPECT_EQ(0, static_cast<TestInstaller*>(com2.installer)->error());
-  EXPECT_EQ(0, static_cast<TestInstaller*>(com2.installer)->install_count());
+  EXPECT_EQ(0, installer1->error());
+  EXPECT_EQ(1, installer1->install_count());
+  EXPECT_EQ(0, installer2->error());
+  EXPECT_EQ(0, installer2->install_count());
 
   EXPECT_EQ(3, post_interceptor_->GetHitCount())
       << post_interceptor_->GetRequestsAsString();
   EXPECT_EQ(1, get_interceptor_->GetHitCount());
 
   EXPECT_NE(
       string::npos,
       post_interceptor_->GetRequests()[0].find(
           "<app appid=\"jebgalgnebhfojomionfpkfelancnnkf\" version=\"0.9\">"
           "<updatecheck /></app>"))
@@ skipping 31 matching lines @@
         .Times(1);
     EXPECT_CALL(observer,
                 OnEvent(ServiceObserver::COMPONENT_UPDATER_SLEEPING, ""))
         .Times(1);
   }
 
   post_interceptor_->Reset();
   EXPECT_TRUE(post_interceptor_->ExpectRequest(
       new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
 
-  TestInstaller installer3;
+  scoped_refptr<TestInstaller> installer3(new TestInstaller);
   EXPECT_EQ(ComponentUpdateService::kReplaced,
-            RegisterComponent(
-                &com1, kTestComponent_jebg, Version("2.2"), &installer3));
+            RegisterComponent(&com1, kTestComponent_jebg, Version("2.2"),
+                              installer3));
 
   // Loop once just to notice the check happening with the re-register version.
   test_configurator()->SetLoopCount(1);
   component_updater()->Start();
   RunThreads();
 
   // We created a new installer, so the counts go back to 0.
-  EXPECT_EQ(0, static_cast<TestInstaller*>(com1.installer)->error());
-  EXPECT_EQ(0, static_cast<TestInstaller*>(com1.installer)->install_count());
-  EXPECT_EQ(0, static_cast<TestInstaller*>(com2.installer)->error());
-  EXPECT_EQ(0, static_cast<TestInstaller*>(com2.installer)->install_count());
+  EXPECT_EQ(0, installer3->error());
+  EXPECT_EQ(0, installer3->install_count());
+  EXPECT_EQ(0, installer2->error());
+  EXPECT_EQ(0, installer2->install_count());
 
   // One update check and no additional pings are expected.
   EXPECT_EQ(1, post_interceptor_->GetHitCount())
       << post_interceptor_->GetRequestsAsString();
   EXPECT_EQ(1, post_interceptor_->GetCount())
       << post_interceptor_->GetRequestsAsString();
 
   EXPECT_NE(
       string::npos,
       post_interceptor_->GetRequests()[0].find(
@@ skipping 28 matching lines @@
       test_file("updatecheck_diff_reply_3.xml")));
 
   get_interceptor_->SetResponse(
       GURL("http://localhost/download/ihfokbkgjpifnbbojhneepfflplebdkc_1.crx"),
       test_file("ihfokbkgjpifnbbojhneepfflplebdkc_1.crx"));
   get_interceptor_->SetResponse(
       GURL("http://localhost/download/"
            "ihfokbkgjpifnbbojhneepfflplebdkc_1to2.crx"),
       test_file("ihfokbkgjpifnbbojhneepfflplebdkc_1to2.crx"));
 
-  VersionedTestInstaller installer;
+  scoped_refptr<TestInstaller> installer(new VersionedTestInstaller);
   CrxComponent com;
-  RegisterComponent(&com, kTestComponent_ihfo, Version("0.0"), &installer);
+  RegisterComponent(&com, kTestComponent_ihfo, Version("0.0"), installer);
 
   test_configurator()->SetLoopCount(3);
   component_updater()->Start();
   RunThreads();
 
-  EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->error());
-  EXPECT_EQ(2, static_cast<TestInstaller*>(com.installer)->install_count());
+  EXPECT_EQ(0, installer->error());
+  EXPECT_EQ(2, installer->install_count());
 
   EXPECT_EQ(5, post_interceptor_->GetHitCount())
       << post_interceptor_->GetRequestsAsString();
   EXPECT_EQ(5, post_interceptor_->GetCount())
       << post_interceptor_->GetRequestsAsString();
   EXPECT_EQ(2, get_interceptor_->GetHitCount());
 
   EXPECT_NE(
       string::npos,
       post_interceptor_->GetRequests()[0].find(
@@ skipping 59 matching lines @@
       GURL("http://localhost/download/ihfokbkgjpifnbbojhneepfflplebdkc_1.crx"),
       test_file("ihfokbkgjpifnbbojhneepfflplebdkc_1.crx"));
   get_interceptor_->SetResponse(
       GURL("http://localhost/download/"
           "ihfokbkgjpifnbbojhneepfflplebdkc_1to2.crx"),
       test_file("ihfokbkgjpifnbbojhneepfflplebdkc_1to2.crx"));
   get_interceptor_->SetResponse(
       GURL("http://localhost/download/ihfokbkgjpifnbbojhneepfflplebdkc_2.crx"),
       test_file("ihfokbkgjpifnbbojhneepfflplebdkc_2.crx"));
 
-  TestInstaller installer;
+  scoped_refptr<TestInstaller> installer(new TestInstaller);
   CrxComponent com;
-  RegisterComponent(&com, kTestComponent_ihfo, Version("1.0"), &installer);
+  RegisterComponent(&com, kTestComponent_ihfo, Version("1.0"), installer);
 
   test_configurator()->SetLoopCount(2);
   component_updater()->Start();
   RunThreads();
 
   // A failed differential update does not count as a failed install.
-  EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->error());
-  EXPECT_EQ(1, static_cast<TestInstaller*>(com.installer)->install_count());
+  EXPECT_EQ(0, installer->error());
+  EXPECT_EQ(1, installer->install_count());
 
   EXPECT_EQ(3, post_interceptor_->GetHitCount())
       << post_interceptor_->GetRequestsAsString();
   EXPECT_EQ(3, post_interceptor_->GetCount())
       << post_interceptor_->GetRequestsAsString();
   EXPECT_EQ(2, get_interceptor_->GetHitCount());
 
   EXPECT_NE(
       string::npos,
       post_interceptor_->GetRequests()[0].find(
@@ skipping 20 matching lines @@
 
 // Test is flakey on Android bots. See crbug.com/331420.
 #if defined(OS_ANDROID)
 #define MAYBE_CheckFailedInstallPing DISABLED_CheckFailedInstallPing
 #else
 #define MAYBE_CheckFailedInstallPing CheckFailedInstallPing
 #endif
 // Verify that a failed installation causes an install failure ping.
 TEST_F(ComponentUpdaterTest, MAYBE_CheckFailedInstallPing) {
   // This test installer reports installation failure.
-  class : public TestInstaller {
+  class FailingTestInstaller : public TestInstaller {
     bool Install(const base::DictionaryValue& manifest,
                  const base::FilePath& unpack_path) override {
       ++install_count_;
       base::DeleteFile(unpack_path, true);
       return false;
     }
-  } installer;
+   private:
+    ~FailingTestInstaller() override {}
+  };
+  scoped_refptr<FailingTestInstaller> installer(new FailingTestInstaller);
 
   EXPECT_TRUE(post_interceptor_->ExpectRequest(
       new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
   EXPECT_TRUE(post_interceptor_->ExpectRequest(new PartialMatch("event")));
   EXPECT_TRUE(post_interceptor_->ExpectRequest(
       new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
   EXPECT_TRUE(post_interceptor_->ExpectRequest(new PartialMatch("event")));
   get_interceptor_->SetResponse(
       GURL(expected_crx_url),
       test_file("jebgalgnebhfojomionfpkfelancnnkf.crx"));
 
   // Start with 0.9, and attempt update to 1.0.
   // Loop twice to issue two checks: (1) with original 0.9 version
   // and (2), which should retry with 0.9.
   CrxComponent com;
-  RegisterComponent(&com, kTestComponent_jebg, Version("0.9"), &installer);
+  RegisterComponent(&com, kTestComponent_jebg, Version("0.9"), installer);
 
   test_configurator()->SetLoopCount(2);
   component_updater()->Start();
   RunThreads();
 
   EXPECT_EQ(4, post_interceptor_->GetHitCount())
       << post_interceptor_->GetRequestsAsString();
   EXPECT_EQ(2, get_interceptor_->GetHitCount());
 
   EXPECT_NE(
@@ skipping 30 matching lines @@
   // iteration.
   post_interceptor_->Reset();
   EXPECT_TRUE(post_interceptor_->ExpectRequest(
       new PartialMatch("updatecheck"),
       test_file("updatecheck_reply_noupdate.xml")));
 
   test_configurator()->SetLoopCount(1);
   component_updater()->Start();
   RunThreads();
 
-  EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->error());
-  EXPECT_EQ(2, static_cast<TestInstaller*>(com.installer)->install_count());
+  EXPECT_EQ(0, installer->error());
+  EXPECT_EQ(2, installer->install_count());
 
   EXPECT_EQ(1, post_interceptor_->GetHitCount())
       << post_interceptor_->GetRequestsAsString();
   EXPECT_EQ(1, post_interceptor_->GetCount())
       << post_interceptor_->GetRequestsAsString();
 
   EXPECT_NE(
       string::npos,
       post_interceptor_->GetRequests()[0].find(
           "<app appid=\"jebgalgnebhfojomionfpkfelancnnkf\" version=\"0.9\">"
@@ skipping 27 matching lines @@
   // actually dowloaded contains a patching error, an therefore, an error
   // is injected at the time of patching.
   get_interceptor_->SetResponse(
       GURL("http://localhost/download/"
            "ihfokbkgjpifnbbojhneepfflplebdkc_1to2.crx"),
       test_file("ihfokbkgjpifnbbojhneepfflplebdkc_1to2_bad.crx"));
   get_interceptor_->SetResponse(
       GURL("http://localhost/download/ihfokbkgjpifnbbojhneepfflplebdkc_2.crx"),
       test_file("ihfokbkgjpifnbbojhneepfflplebdkc_2.crx"));
 
-  VersionedTestInstaller installer;
+  scoped_refptr<TestInstaller> installer(new VersionedTestInstaller);
   CrxComponent com;
-  RegisterComponent(&com, kTestComponent_ihfo, Version("0.0"), &installer);
+  RegisterComponent(&com, kTestComponent_ihfo, Version("0.0"), installer);
 
   test_configurator()->SetLoopCount(3);
   component_updater()->Start();
   RunThreads();
   component_updater()->Stop();
 
-  EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->error());
-  EXPECT_EQ(2, static_cast<TestInstaller*>(com.installer)->install_count());
+  EXPECT_EQ(0, installer->error());
+  EXPECT_EQ(2, installer->install_count());
 
   EXPECT_EQ(5, post_interceptor_->GetHitCount())
       << post_interceptor_->GetRequestsAsString();
   EXPECT_EQ(5, post_interceptor_->GetCount())
       << post_interceptor_->GetRequestsAsString();
   EXPECT_EQ(3, get_interceptor_->GetHitCount());
 
   EXPECT_NE(
       string::npos,
       post_interceptor_->GetRequests()[0].find(
@@ skipping 82 matching lines @@
                         "abagagagagagagagagagagagagagagag"))
         .Times(1);
     EXPECT_CALL(observer,
                 OnEvent(ServiceObserver::COMPONENT_UPDATER_SLEEPING, ""))
         .Times(1);
   }
 
   EXPECT_TRUE(post_interceptor_->ExpectRequest(
       new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
 
-  TestInstaller installer;
+  scoped_refptr<TestInstaller> installer(new TestInstaller);
   CrxComponent com;
   component_updater()->AddObserver(&observer);
   EXPECT_EQ(
       ComponentUpdateService::kOk,
-      RegisterComponent(&com, kTestComponent_abag, Version("1.1"), &installer));
+      RegisterComponent(&com, kTestComponent_abag, Version("1.1"), installer));
   // The following two calls ensure that we don't do an update check via the
   // timer, so the only update check should be the on-demand one.
   test_configurator()->SetInitialDelay(1000000);
   test_configurator()->SetRecheckTime(1000000);
   test_configurator()->SetLoopCount(1);
   component_updater()->Start();
 
   RunThreadsUntilIdle();
 
   EXPECT_EQ(0, post_interceptor_->GetHitCount());
 
   BrowserThread::PostTask(BrowserThread::IO,
                           FROM_HERE,
                           base::Bind(&RequestAndDeleteResourceThrottle,
                                      component_updater(),
                                      "abagagagagagagagagagagagagagagag"));
 
   RunThreads();
 
   EXPECT_EQ(1, post_interceptor_->GetHitCount());
-  EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->error());
-  EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->install_count());
+  EXPECT_EQ(0, installer->error());
+  EXPECT_EQ(0, installer->install_count());
 
   component_updater()->Stop();
 }
 
 class CancelResourceController : public TestResourceController {
  public:
   CancelResourceController() : throttle_(NULL), resume_called_(0) {}
   ~CancelResourceController() override {
     // Check that the throttle has been resumed by the time we
     // exit the test.
@@ skipping 52 matching lines @@
                 OnEvent(ServiceObserver::COMPONENT_UPDATER_SLEEPING, ""))
         .Times(1);
     EXPECT_CALL(observer,
                 OnEvent(ServiceObserver::COMPONENT_UPDATER_STARTED, ""))
         .Times(1);
   }
 
   EXPECT_TRUE(post_interceptor_->ExpectRequest(
       new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
 
-  TestInstaller installer;
+  scoped_refptr<TestInstaller> installer(new TestInstaller);
   CrxComponent com;
   component_updater()->AddObserver(&observer);
-  EXPECT_EQ(
-      ComponentUpdateService::kOk,
-      RegisterComponent(&com, kTestComponent_abag, Version("1.1"), &installer));
+  EXPECT_EQ(ComponentUpdateService::kOk,
+            RegisterComponent(&com, kTestComponent_abag, Version("1.1"),
+                              installer));
   // The following two calls ensure that we don't do an update check via the
   // timer, so the only update check should be the on-demand one.
   test_configurator()->SetInitialDelay(1000000);
   test_configurator()->SetRecheckTime(1000000);
   test_configurator()->SetLoopCount(1);
   component_updater()->Start();
 
   RunThreadsUntilIdle();
 
   EXPECT_EQ(0, post_interceptor_->GetHitCount());
 
   {
     // First on-demand update check is expected to succeeded.
     CancelResourceController controller;
 
     BrowserThread::PostTask(
         BrowserThread::IO,
         FROM_HERE,
         base::Bind(base::IgnoreResult(&RequestTestResourceThrottle),
                    component_updater(),
                    &controller,
                    "abagagagagagagagagagagagagagagag"));
 
     RunThreads();
 
     EXPECT_EQ(1, post_interceptor_->GetHitCount());
-    EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->error());
-    EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->install_count());
+    EXPECT_EQ(0, installer->error());
+    EXPECT_EQ(0, installer->install_count());
 
     component_updater()->Stop();
   }
 
   {
     // Second on-demand update check is expected to succeed as well, since there
     // is no cooldown interval between calls, due to calling SetOnDemandTime.
     test_configurator()->SetOnDemandTime(0);
     test_configurator()->SetLoopCount(1);
     component_updater()->Start();
 
     CancelResourceController controller;
 
     BrowserThread::PostTask(
         BrowserThread::IO,
         FROM_HERE,
         base::Bind(base::IgnoreResult(&RequestTestResourceThrottle),
                    component_updater(),
                    &controller,
                    "abagagagagagagagagagagagagagagag"));
 
     RunThreads();
 
     EXPECT_EQ(1, post_interceptor_->GetHitCount());
-    EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->error());
-    EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->install_count());
+    EXPECT_EQ(0, installer->error());
+    EXPECT_EQ(0, installer->install_count());
 
     component_updater()->Stop();
   }
 
   {
     // This on-demand call is expected not to trigger a component update check.
     test_configurator()->SetOnDemandTime(1000000);
     component_updater()->Start();
 
     CancelResourceController controller;
@@ skipping 37 matching lines @@
                 OnEvent(ServiceObserver::COMPONENT_UPDATER_SLEEPING, ""))
         .Times(1);
   }
 
   EXPECT_TRUE(post_interceptor_->ExpectRequest(
       new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
 
   component_updater()->AddObserver(&observer1);
   component_updater()->AddObserver(&observer2);
 
-  TestInstaller installer;
+  scoped_refptr<TestInstaller> installer(new TestInstaller);
   CrxComponent com;
   EXPECT_EQ(
       ComponentUpdateService::kOk,
-      RegisterComponent(&com, kTestComponent_abag, Version("1.1"), &installer));
+      RegisterComponent(&com, kTestComponent_abag, Version("1.1"), installer));
   test_configurator()->SetLoopCount(1);
   component_updater()->Start();
   RunThreads();
 
   // After removing the first observer, it's only the second observer that
   // gets the events.
   EXPECT_TRUE(Mock::VerifyAndClearExpectations(&observer1));
   EXPECT_TRUE(Mock::VerifyAndClearExpectations(&observer2));
   {
     InSequence seq;
@@ skipping 21 matching lines @@
   component_updater()->RemoveObserver(&observer2);
 
   test_configurator()->SetLoopCount(1);
   component_updater()->Start();
   RunThreads();
 
   component_updater()->Stop();
 }
 
 }  // namespace component_updater