NavigationController prototype

webkit/browser/appcache/appcache.cc

Index: webkit/browser/appcache/appcache.cc
diff --git a/webkit/browser/appcache/appcache.cc b/webkit/browser/appcache/appcache.cc
index 2014298547ab62e33e532346b55f21b66c52a9c6..75720947762842620cc73cab8f3254fc4adb673a 100644
--- a/webkit/browser/appcache/appcache.cc
+++ b/webkit/browser/appcache/appcache.cc
@@ -93,7 +93,7 @@ AppCacheExecutableHandler* AppCache::GetExecutableHandler(int64 response_id) {
 }
 
 AppCacheExecutableHandler* AppCache::GetOrCreateExecutableHandler(
-    int64 response_id, net::IOBuffer* handler_source) {
+    int64 response_id, const std::string& raw_handler_source) {
   AppCacheExecutableHandler* handler = GetExecutableHandler(response_id);
   if (handler)
     return handler;
@@ -104,10 +104,10 @@ AppCacheExecutableHandler* AppCache::GetOrCreateExecutableHandler(
   if (!entry || !entry->IsExecutable())
     return NULL;
 
-  DCHECK(storage_->service()->handler_factory());
+  DCHECK(storage_->service()->executable_handler_factory());
   scoped_ptr<AppCacheExecutableHandler> own_ptr =
-      storage_->service()->handler_factory()->
-          CreateHandler(handler_url, handler_source);
+      storage_->service()->executable_handler_factory()->
+          CreateHandler(cache_id_, handler_url, raw_handler_source);
   handler = own_ptr.release();
   if (!handler)
     return NULL;
@@ -304,6 +304,7 @@ void AppCache::ToResourceInfoVector(AppCacheResourceInfoVector* infos) const {
     info.is_fallback = iter->second.IsFallback();
     info.is_foreign = iter->second.IsForeign();
     info.is_explicit = iter->second.IsExplicit();
+    info.is_executable = iter->second.IsExecutable();
     info.size = iter->second.response_size();
     info.response_id = iter->second.response_id();
   }