Fix leak in ServiceWorkerVersionTest.RepeatedlyObserveStatusChanges

content/browser/service_worker/service_worker_version_unittest.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/basictypes.h"
 #include "base/run_loop.h"
 #include "content/browser/service_worker/embedded_worker_registry.h"
 #include "content/browser/service_worker/embedded_worker_test_helper.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_registration.h"
@@ skipping 76 matching lines @@
 }
 
 void VerifyCalled(bool* called) {
   *called = true;
 }
 
 void ObserveStatusChanges(ServiceWorkerVersion* version,
                           std::vector<ServiceWorkerVersion::Status>* statuses) {
   statuses->push_back(version->status());
   version->RegisterStatusChangeCallback(
-      base::Bind(&ObserveStatusChanges, make_scoped_refptr(version), statuses));
+      base::Bind(&ObserveStatusChanges, base::Unretained(version), statuses));
 }
 
 }  // namespace
 
 class ServiceWorkerVersionTest : public testing::Test {
  protected:
   ServiceWorkerVersionTest()
       : thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP) {}
 
   virtual void SetUp() OVERRIDE {
@@ skipping 185 matching lines @@
 
   base::RunLoop().RunUntilIdle();
 
   // After successful completion, version's status must be changed to
   // ACTIVE, and status change callback must have been fired.
   EXPECT_EQ(SERVICE_WORKER_OK, status);
   EXPECT_TRUE(status_change_called);
   EXPECT_EQ(ServiceWorkerVersion::ACTIVE, version_->status());
 }
 
-TEST_F(ServiceWorkerVersionTest, DISABLED_RepeatedlyObserveStatusChanges) {
+TEST_F(ServiceWorkerVersionTest, RepeatedlyObserveStatusChanges) {
   EXPECT_EQ(ServiceWorkerVersion::NEW, version_->status());
 
   // Repeatedly observe status changes (the callback re-registers itself).
   std::vector<ServiceWorkerVersion::Status> statuses;
   version_->RegisterStatusChangeCallback(
       base::Bind(&ObserveStatusChanges, version_, &statuses));
 
   // Dispatch some events.
   ServiceWorkerStatusCode status = SERVICE_WORKER_ERROR_FAILED;
   version_->DispatchInstallEvent(-1, CreateReceiverOnCurrentThread(&status));
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(SERVICE_WORKER_OK, status);
 
   status = SERVICE_WORKER_ERROR_FAILED;
   version_->DispatchActivateEvent(CreateReceiverOnCurrentThread(&status));
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(SERVICE_WORKER_OK, status);
 
   // Verify that we could successfully observe repeated status changes.
   ASSERT_EQ(4U, statuses.size());
   ASSERT_EQ(ServiceWorkerVersion::INSTALLING, statuses[0]);
   ASSERT_EQ(ServiceWorkerVersion::INSTALLED, statuses[1]);
   ASSERT_EQ(ServiceWorkerVersion::ACTIVATING, statuses[2]);
   ASSERT_EQ(ServiceWorkerVersion::ACTIVE, statuses[3]);
 }
 
 }  // namespace content