Remove implicit conversions from scoped_refptr to T* in content/browser/service_worker

content/browser/service_worker/service_worker_provider_host_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/memory/weak_ptr.h"
 #include "base/thread_task_runner_handle.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_provider_host.h"
 #include "content/browser/service_worker/service_worker_register_job.h"
@@ skipping 20 matching lines @@
                                      base::ThreadTaskRunnerHandle::Get(),
                                      NULL,
                                      NULL,
                                      NULL));
 
     scope_ = GURL("http://www.example.com/");
     script_url_ = GURL("http://www.example.com/service_worker.js");
     registration_ = new ServiceWorkerRegistration(
         scope_, script_url_, 1L, context_->AsWeakPtr());
     version_ = new ServiceWorkerVersion(
-        registration_,
-        1L, context_->AsWeakPtr());
+        registration_.get(), 1L, context_->AsWeakPtr());
 
     // Prepare provider hosts (for the same process).
     scoped_ptr<ServiceWorkerProviderHost> host1(new ServiceWorkerProviderHost(
         kRenderProcessId, 1 /* provider_id */,
         context_->AsWeakPtr(), NULL));
     scoped_ptr<ServiceWorkerProviderHost> host2(new ServiceWorkerProviderHost(
         kRenderProcessId, 2 /* provider_id */,
         context_->AsWeakPtr(), NULL));
     provider_host1_ = host1->AsWeakPtr();
     provider_host2_ = host2->AsWeakPtr();
     context_->AddProviderHost(make_scoped_ptr(host1.release()));
     context_->AddProviderHost(make_scoped_ptr(host2.release()));
   }
 
   virtual void TearDown() OVERRIDE {
     version_ = 0;
     registration_ = 0;
     context_.reset();
   }
 
   void VerifyVersionAttributes(
       base::WeakPtr<ServiceWorkerProviderHost> provider_host,
       ServiceWorkerVersion* installing,
       ServiceWorkerVersion* waiting,
       ServiceWorkerVersion* active) {
-    EXPECT_EQ(installing, provider_host->installing_version_);
-    EXPECT_EQ(waiting, provider_host->waiting_version_);
-    EXPECT_EQ(active, provider_host->active_version_);
-    EXPECT_FALSE(provider_host->controlling_version_);
+    EXPECT_EQ(installing, provider_host->installing_version_.get());
+    EXPECT_EQ(waiting, provider_host->waiting_version_.get());
+    EXPECT_EQ(active, provider_host->active_version_.get());
+    EXPECT_FALSE(provider_host->controlling_version_.get());
   }
 
   content::TestBrowserThreadBundle thread_bundle_;
   scoped_ptr<ServiceWorkerContextCore> context_;
   scoped_refptr<ServiceWorkerRegistration> registration_;
   scoped_refptr<ServiceWorkerVersion> version_;
   base::WeakPtr<ServiceWorkerProviderHost> provider_host1_;
   base::WeakPtr<ServiceWorkerProviderHost> provider_host2_;
   GURL scope_;
   GURL script_url_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerProviderHostTest);
 };
 
 TEST_F(ServiceWorkerProviderHostTest, SetActiveVersion_ProcessStatus) {
-  provider_host1_->AssociateRegistration(registration_);
+  provider_host1_->AssociateRegistration(registration_.get());
   ASSERT_FALSE(version_->HasProcessToRun());
 
   // Associating version_ to a provider_host's active version will internally
   // add the provider_host's process ref to the version.
-  registration_->SetActiveVersion(version_);
+  registration_->SetActiveVersion(version_.get());
   ASSERT_TRUE(version_->HasProcessToRun());
 
   // Re-associating the same version and provider_host should just work too.
-  registration_->SetActiveVersion(version_);
+  registration_->SetActiveVersion(version_.get());
   ASSERT_TRUE(version_->HasProcessToRun());
 
   // Resetting the provider_host's active version should remove process refs
   // from the version.
   provider_host1_->UnassociateRegistration();
   ASSERT_FALSE(version_->HasProcessToRun());
 }
 
 TEST_F(ServiceWorkerProviderHostTest,
        SetActiveVersion_MultipleHostsForSameProcess) {
-  provider_host1_->AssociateRegistration(registration_);
-  provider_host2_->AssociateRegistration(registration_);
+  provider_host1_->AssociateRegistration(registration_.get());
+  provider_host2_->AssociateRegistration(registration_.get());
   ASSERT_FALSE(version_->HasProcessToRun());
 
   // Associating version_ to two providers as active version.
-  registration_->SetActiveVersion(version_);
+  registration_->SetActiveVersion(version_.get());
   ASSERT_TRUE(version_->HasProcessToRun());
 
   // Disassociating one provider_host shouldn't remove all process refs
   // from the version yet.
   provider_host1_->UnassociateRegistration();
   ASSERT_TRUE(version_->HasProcessToRun());
 
   // Disassociating the other provider_host will remove all process refs.
   provider_host2_->UnassociateRegistration();
   ASSERT_FALSE(version_->HasProcessToRun());
 }
 
 TEST_F(ServiceWorkerProviderHostTest, SetWaitingVersion_ProcessStatus) {
-  provider_host1_->AssociateRegistration(registration_);
+  provider_host1_->AssociateRegistration(registration_.get());
   ASSERT_FALSE(version_->HasProcessToRun());
 
   // Associating version_ to a provider_host's waiting version will internally
   // add the provider_host's process ref to the version.
-  registration_->SetWaitingVersion(version_);
+  registration_->SetWaitingVersion(version_.get());
   ASSERT_TRUE(version_->HasProcessToRun());
 
   // Re-associating the same version and provider_host should just work too.
-  registration_->SetWaitingVersion(version_);
+  registration_->SetWaitingVersion(version_.get());
   ASSERT_TRUE(version_->HasProcessToRun());
 
   // Resetting the provider_host's waiting version should remove process refs
   // from the version.
   provider_host1_->UnassociateRegistration();
   ASSERT_FALSE(version_->HasProcessToRun());
 }
 
 TEST_F(ServiceWorkerProviderHostTest,
        SetWaitingVersion_MultipleHostsForSameProcess) {
-  provider_host1_->AssociateRegistration(registration_);
-  provider_host2_->AssociateRegistration(registration_);
+  provider_host1_->AssociateRegistration(registration_.get());
+  provider_host2_->AssociateRegistration(registration_.get());
   ASSERT_FALSE(version_->HasProcessToRun());
 
   // Associating version_ to two providers as waiting version.
-  registration_->SetWaitingVersion(version_);
+  registration_->SetWaitingVersion(version_.get());
   ASSERT_TRUE(version_->HasProcessToRun());
 
   // Disassociating one provider_host shouldn't remove all process refs
   // from the version yet.
   provider_host1_->UnassociateRegistration();
   ASSERT_TRUE(version_->HasProcessToRun());
 
   // Disassociating the other provider_host will remove all process refs.
   provider_host2_->UnassociateRegistration();
   ASSERT_FALSE(version_->HasProcessToRun());
 }
 
 TEST_F(ServiceWorkerProviderHostTest,
        ObserveVersionAttributesChanged_Basic) {
-  provider_host1_->AssociateRegistration(registration_);
-  provider_host2_->AssociateRegistration(registration_);
+  provider_host1_->AssociateRegistration(registration_.get());
+  provider_host2_->AssociateRegistration(registration_.get());
   VerifyVersionAttributes(provider_host1_, NULL, NULL, NULL);
   VerifyVersionAttributes(provider_host2_, NULL, NULL, NULL);
 
-  registration_->SetInstallingVersion(version_);
-  VerifyVersionAttributes(provider_host1_, version_, NULL, NULL);
-  VerifyVersionAttributes(provider_host2_, version_, NULL, NULL);
+  registration_->SetInstallingVersion(version_.get());
+  VerifyVersionAttributes(provider_host1_, version_.get(), NULL, NULL);
+  VerifyVersionAttributes(provider_host2_, version_.get(), NULL, NULL);
 
-  registration_->SetWaitingVersion(version_);
-  VerifyVersionAttributes(provider_host1_, NULL, version_, NULL);
-  VerifyVersionAttributes(provider_host2_, NULL, version_, NULL);
+  registration_->SetWaitingVersion(version_.get());
+  VerifyVersionAttributes(provider_host1_, NULL, version_.get(), NULL);
+  VerifyVersionAttributes(provider_host2_, NULL, version_.get(), NULL);
 
   // Disassociating the registration should clear all version attributes.
   provider_host2_->UnassociateRegistration();
-  VerifyVersionAttributes(provider_host1_, NULL, version_, NULL);
+  VerifyVersionAttributes(provider_host1_, NULL, version_.get(), NULL);
   VerifyVersionAttributes(provider_host2_, NULL, NULL, NULL);
 
   // Shouldn't notify the disassociated provider of the change.
-  registration_->SetActiveVersion(version_);
-  VerifyVersionAttributes(provider_host1_, NULL, NULL, version_);
+  registration_->SetActiveVersion(version_.get());
+  VerifyVersionAttributes(provider_host1_, NULL, NULL, version_.get());
   VerifyVersionAttributes(provider_host2_, NULL, NULL, NULL);
 }
 
 TEST_F(ServiceWorkerProviderHostTest,
        ObserveVersionAttributesChanged_MultipleVersions) {
-  provider_host1_->AssociateRegistration(registration_);
-  provider_host2_->AssociateRegistration(registration_);
+  provider_host1_->AssociateRegistration(registration_.get());
+  provider_host2_->AssociateRegistration(registration_.get());
   VerifyVersionAttributes(provider_host1_, NULL, NULL, NULL);
   VerifyVersionAttributes(provider_host2_, NULL, NULL, NULL);
 
   scoped_refptr<ServiceWorkerVersion> version1 =
-      new ServiceWorkerVersion(registration_, 10L, context_->AsWeakPtr());
+      new ServiceWorkerVersion(registration_.get(), 10L, context_->AsWeakPtr());
   scoped_refptr<ServiceWorkerVersion> version2 =
-      new ServiceWorkerVersion(registration_, 20L, context_->AsWeakPtr());
+      new ServiceWorkerVersion(registration_.get(), 20L, context_->AsWeakPtr());
 
-  registration_->SetInstallingVersion(version1);
-  VerifyVersionAttributes(provider_host1_, version1, NULL, NULL);
-  VerifyVersionAttributes(provider_host2_, version1, NULL, NULL);
+  registration_->SetInstallingVersion(version1.get());
+  VerifyVersionAttributes(provider_host1_, version1.get(), NULL, NULL);
+  VerifyVersionAttributes(provider_host2_, version1.get(), NULL, NULL);
 
-  registration_->SetWaitingVersion(version1);
-  VerifyVersionAttributes(provider_host1_, NULL, version1, NULL);
-  VerifyVersionAttributes(provider_host2_, NULL, version1, NULL);
+  registration_->SetWaitingVersion(version1.get());
+  VerifyVersionAttributes(provider_host1_, NULL, version1.get(), NULL);
+  VerifyVersionAttributes(provider_host2_, NULL, version1.get(), NULL);
 
-  registration_->SetInstallingVersion(version2);
-  VerifyVersionAttributes(provider_host1_, version2, version1, NULL);
-  VerifyVersionAttributes(provider_host2_, version2, version1, NULL);
+  registration_->SetInstallingVersion(version2.get());
+  VerifyVersionAttributes(
+      provider_host1_, version2.get(), version1.get(), NULL);
+  VerifyVersionAttributes(
+      provider_host2_, version2.get(), version1.get(), NULL);
 
   // Disassociating the registration should clear all version attributes.
   provider_host2_->UnassociateRegistration();
-  VerifyVersionAttributes(provider_host1_, version2, version1, NULL);
+  VerifyVersionAttributes(
+      provider_host1_, version2.get(), version1.get(), NULL);
   VerifyVersionAttributes(provider_host2_, NULL, NULL, NULL);
 
   // Shouldn't notify the disassociated provider of the change.
-  registration_->SetActiveVersion(version1);
-  VerifyVersionAttributes(provider_host1_, version2, NULL, version1);
+  registration_->SetActiveVersion(version1.get());
+  VerifyVersionAttributes(
+      provider_host1_, version2.get(), NULL, version1.get());
   VerifyVersionAttributes(provider_host2_, NULL, NULL, NULL);
 
-  registration_->SetActiveVersion(version2);
-  VerifyVersionAttributes(provider_host1_, NULL, NULL, version2);
+  registration_->SetActiveVersion(version2.get());
+  VerifyVersionAttributes(provider_host1_, NULL, NULL, version2.get());
   VerifyVersionAttributes(provider_host2_, NULL, NULL, NULL);
 }
 
 }  // namespace content