Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(95)

Unified Diff: content/browser/service_worker/service_worker_registration_unittest.cc

Issue 508433002: Remove implicit conversions from scoped_refptr to T* in content/browser/service_worker (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/service_worker/service_worker_registration_unittest.cc
diff --git a/content/browser/service_worker/service_worker_registration_unittest.cc b/content/browser/service_worker/service_worker_registration_unittest.cc
index 9e3bd126632d21088faaf63dea5d29c2341f4bbe..6992866a229cff86151d8500d4414b01ed3c25f1 100644
--- a/content/browser/service_worker/service_worker_registration_unittest.cc
+++ b/content/browser/service_worker/service_worker_registration_unittest.cc
@@ -43,7 +43,7 @@ class ServiceWorkerRegistrationTest : public testing::Test {
public:
RegistrationListener() {}
~RegistrationListener() {
- if (observed_registration_)
+ if (observed_registration_.get())
observed_registration_->RemoveListener(this);
}
@@ -93,15 +93,15 @@ TEST_F(ServiceWorkerRegistrationTest, SetAndUnsetVersions) {
const int64 version_1_id = 1L;
const int64 version_2_id = 2L;
scoped_refptr<ServiceWorkerVersion> version_1 =
- new ServiceWorkerVersion(registration, version_1_id, context_ptr_);
+ new ServiceWorkerVersion(registration.get(), version_1_id, context_ptr_);
scoped_refptr<ServiceWorkerVersion> version_2 =
- new ServiceWorkerVersion(registration, version_2_id, context_ptr_);
+ new ServiceWorkerVersion(registration.get(), version_2_id, context_ptr_);
RegistrationListener listener;
registration->AddListener(&listener);
- registration->SetActiveVersion(version_1);
+ registration->SetActiveVersion(version_1.get());
- EXPECT_EQ(version_1, registration->active_version());
+ EXPECT_EQ(version_1.get(), registration->active_version());
EXPECT_EQ(registration, listener.observed_registration_);
EXPECT_EQ(ChangedVersionAttributesMask::ACTIVE_VERSION,
listener.observed_changed_mask_.changed());
@@ -113,9 +113,9 @@ TEST_F(ServiceWorkerRegistrationTest, SetAndUnsetVersions) {
EXPECT_TRUE(listener.observed_info_.controlling_version.is_null);
listener.Reset();
- registration->SetInstallingVersion(version_2);
+ registration->SetInstallingVersion(version_2.get());
- EXPECT_EQ(version_2, registration->installing_version());
+ EXPECT_EQ(version_2.get(), registration->installing_version());
EXPECT_EQ(ChangedVersionAttributesMask::INSTALLING_VERSION,
listener.observed_changed_mask_.changed());
EXPECT_EQ(version_1_id, listener.observed_info_.active_version.version_id);
@@ -125,9 +125,9 @@ TEST_F(ServiceWorkerRegistrationTest, SetAndUnsetVersions) {
EXPECT_TRUE(listener.observed_info_.controlling_version.is_null);
listener.Reset();
- registration->SetWaitingVersion(version_2);
+ registration->SetWaitingVersion(version_2.get());
- EXPECT_EQ(version_2, registration->waiting_version());
+ EXPECT_EQ(version_2.get(), registration->waiting_version());
EXPECT_FALSE(registration->installing_version());
EXPECT_TRUE(listener.observed_changed_mask_.waiting_changed());
EXPECT_TRUE(listener.observed_changed_mask_.installing_changed());
@@ -137,7 +137,7 @@ TEST_F(ServiceWorkerRegistrationTest, SetAndUnsetVersions) {
EXPECT_TRUE(listener.observed_info_.controlling_version.is_null);
listener.Reset();
- registration->UnsetVersion(version_2);
+ registration->UnsetVersion(version_2.get());
EXPECT_FALSE(registration->waiting_version());
EXPECT_EQ(ChangedVersionAttributesMask::WAITING_VERSION,

Powered by Google App Engine
This is Rietveld 408576698