Add storage code to appcache update process.

webkit/appcache/appcache_group.cc

 // Copyright (c) 2009 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 "webkit/appcache/appcache_group.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "webkit/appcache/appcache.h"
@@ skipping 57 matching lines @@
       }
     }
   } else {
     old_caches_.push_back(complete_cache);
   }
 }
 
 void AppCacheGroup::RemoveCache(AppCache* cache) {
   DCHECK(cache->associated_hosts().empty());
   if (cache == newest_complete_cache_) {
-    AppCache* cache = newest_complete_cache_;
+    AppCache* tmp_cache = newest_complete_cache_;
     newest_complete_cache_ = NULL;
-    cache->set_owning_group(NULL);  // may cause this group to be deleted
+    tmp_cache->set_owning_group(NULL);  // may cause this group to be deleted
   } else {
     Caches::iterator it =
         std::find(old_caches_.begin(), old_caches_.end(), cache);
     if (it != old_caches_.end()) {
-      AppCache* cache = *it;
+      AppCache* tmp_cache = *it;
       old_caches_.erase(it);
-      cache->set_owning_group(NULL);  // may cause group to be deleted
+      tmp_cache->set_owning_group(NULL);  // may cause group to be deleted
     }
   }
 }
 
+void AppCacheGroup::RestoreCacheAsNewest(AppCache* former_newest_cache) {
+  newest_complete_cache_->set_owning_group(NULL);
+  newest_complete_cache_ = former_newest_cache;
+  if (former_newest_cache) {
+    DCHECK(former_newest_cache->owning_group() == this);
+    Caches::iterator it =
+        std::find(old_caches_.begin(), old_caches_.end(), former_newest_cache);
+    DCHECK(it != old_caches_.end());
+    old_caches_.erase(it);
+  }
+}
+
 void AppCacheGroup::StartUpdateWithNewMasterEntry(
     AppCacheHost* host, const GURL& new_master_resource) {
   if (!update_job_)
     update_job_ = new AppCacheUpdateJob(service_, this);
 
   update_job_->StartUpdate(host, new_master_resource);
 }
 
 void AppCacheGroup::SetUpdateStatus(UpdateStatus status) {
   if (status == update_status_)
     return;
 
   update_status_ = status;
 
   if (status != IDLE) {
     DCHECK(update_job_);
   } else {
     update_job_ = NULL;
     FOR_EACH_OBSERVER(UpdateObserver, observers_, OnUpdateComplete(this));
   }
 }
 
 }  // namespace appcache