ServiceWorker: some more groundwork in support of the update process

content/browser/service_worker/service_worker_context_core.cc

Index: content/browser/service_worker/service_worker_context_core.cc
diff --git a/content/browser/service_worker/service_worker_context_core.cc b/content/browser/service_worker/service_worker_context_core.cc
index 4bfd33c8f8862272d0a58d5209cf56d3b539dd9c..933aa5f7ce7618d4acc53aeeb103e2ab1fb5c977 100644
--- a/content/browser/service_worker/service_worker_context_core.cc
+++ b/content/browser/service_worker/service_worker_context_core.cc
@@ -33,7 +33,7 @@ ServiceWorkerContextCore::ProviderHostIterator::GetProviderHost() {
 void ServiceWorkerContextCore::ProviderHostIterator::Advance() {
   DCHECK(!IsAtEnd());
   DCHECK(!provider_host_iterator_->IsAtEnd());
-  DCHECK(!provider_iterator_->IsAtEnd());
+  DCHECK(!process_iterator_->IsAtEnd());
 
   // Advance the inner iterator. If an element is reached, we're done.
   provider_host_iterator_->Advance();
@@ -42,10 +42,10 @@ void ServiceWorkerContextCore::ProviderHostIterator::Advance() {
 
   // Advance the outer iterator until an element is reached, or end is hit.
   while (true) {
-    provider_iterator_->Advance();
-    if (provider_iterator_->IsAtEnd())
+    process_iterator_->Advance();
+    if (process_iterator_->IsAtEnd())
       return;
-    ProviderMap* provider_map = provider_iterator_->GetCurrentValue();
+    ProviderMap* provider_map = process_iterator_->GetCurrentValue();
     provider_host_iterator_.reset(new ProviderMap::iterator(provider_map));
     if (!provider_host_iterator_->IsAtEnd())
       return;
@@ -53,7 +53,7 @@ void ServiceWorkerContextCore::ProviderHostIterator::Advance() {
 }
 
 bool ServiceWorkerContextCore::ProviderHostIterator::IsAtEnd() {
-  return provider_iterator_->IsAtEnd() &&
+  return process_iterator_->IsAtEnd() &&
          (!provider_host_iterator_ || provider_host_iterator_->IsAtEnd());
 }
 
@@ -65,14 +65,14 @@ ServiceWorkerContextCore::ProviderHostIterator::ProviderHostIterator(
 }
 
 void ServiceWorkerContextCore::ProviderHostIterator::Initialize() {
-  provider_iterator_.reset(new ProcessToProviderMap::iterator(map_));
+  process_iterator_.reset(new ProcessToProviderMap::iterator(map_));
   // Advance to the first element.
-  while (!provider_iterator_->IsAtEnd()) {
-    ProviderMap* provider_map = provider_iterator_->GetCurrentValue();
+  while (!process_iterator_->IsAtEnd()) {
+    ProviderMap* provider_map = process_iterator_->GetCurrentValue();
     provider_host_iterator_.reset(new ProviderMap::iterator(provider_map));
     if (!provider_host_iterator_->IsAtEnd())
       return;
-    provider_iterator_->Advance();
+    process_iterator_->Advance();
   }
 }