From 4871b882829438f51e536fd24d832fb4d0be5d3f Mon Sep 17 00:00:00 2001 From: nhiroki Date: Mon, 10 Nov 2014 03:39:38 -0800 Subject: [PATCH] ServiceWorker: Remove unused controlling_version fields BUG=428489 TEST=n/a Review URL: https://codereview.chromium.org/710993002 Cr-Commit-Position: refs/heads/master@{#303447} --- content/browser/service_worker/service_worker_info.h | 1 - .../service_worker/service_worker_registration_unittest.cc | 8 -------- 2 files changed, 9 deletions(-) diff --git a/content/browser/service_worker/service_worker_info.h b/content/browser/service_worker/service_worker_info.h index 0e93bd0748b6..36593a69cc19 100644 --- a/content/browser/service_worker/service_worker_info.h +++ b/content/browser/service_worker/service_worker_info.h @@ -48,7 +48,6 @@ class CONTENT_EXPORT ServiceWorkerRegistrationInfo { GURL pattern; int64 registration_id; - ServiceWorkerVersionInfo controlling_version; ServiceWorkerVersionInfo active_version; ServiceWorkerVersionInfo waiting_version; ServiceWorkerVersionInfo installing_version; diff --git a/content/browser/service_worker/service_worker_registration_unittest.cc b/content/browser/service_worker/service_worker_registration_unittest.cc index cea4b47734b3..3f444c0bde59 100644 --- a/content/browser/service_worker/service_worker_registration_unittest.cc +++ b/content/browser/service_worker/service_worker_registration_unittest.cc @@ -124,8 +124,6 @@ TEST_F(ServiceWorkerRegistrationTest, SetAndUnsetVersions) { kInvalidServiceWorkerVersionId); EXPECT_EQ(listener.observed_info_.waiting_version.version_id, kInvalidServiceWorkerVersionId); - EXPECT_EQ(listener.observed_info_.controlling_version.version_id, - kInvalidServiceWorkerVersionId); listener.Reset(); registration->SetInstallingVersion(version_2.get()); @@ -138,8 +136,6 @@ TEST_F(ServiceWorkerRegistrationTest, SetAndUnsetVersions) { listener.observed_info_.installing_version.version_id); EXPECT_EQ(listener.observed_info_.waiting_version.version_id, kInvalidServiceWorkerVersionId); - EXPECT_EQ(listener.observed_info_.controlling_version.version_id, - kInvalidServiceWorkerVersionId); listener.Reset(); registration->SetWaitingVersion(version_2.get()); @@ -152,8 +148,6 @@ TEST_F(ServiceWorkerRegistrationTest, SetAndUnsetVersions) { EXPECT_EQ(version_2_id, listener.observed_info_.waiting_version.version_id); EXPECT_EQ(listener.observed_info_.installing_version.version_id, kInvalidServiceWorkerVersionId); - EXPECT_EQ(listener.observed_info_.controlling_version.version_id, - kInvalidServiceWorkerVersionId); listener.Reset(); registration->UnsetVersion(version_2.get()); @@ -166,8 +160,6 @@ TEST_F(ServiceWorkerRegistrationTest, SetAndUnsetVersions) { kInvalidServiceWorkerVersionId); EXPECT_EQ(listener.observed_info_.installing_version.version_id, kInvalidServiceWorkerVersionId); - EXPECT_EQ(listener.observed_info_.controlling_version.version_id, - kInvalidServiceWorkerVersionId); } TEST_F(ServiceWorkerRegistrationTest, FailedRegistrationNoCrash) { -- 2.11.4.GIT