4 files changed, 1 insertions, 59 deletions

diff --git a/webkit/glue/webframe.h b/webkit/glue/webframe.h
index 1a6ae34..48d64fe 100644
--- a/webkit/glue/webframe.h
+++ b/webkit/glue/webframe.h
@@ -13,7 +13,6 @@
 #include "skia/ext/platform_canvas.h"
 
 class GURL;
-class WebAppCacheContext;
 class WebView;
 class WebTextInput;
 struct NPObject;
@@ -409,14 +408,6 @@ class WebFrame {
   // Reformats the web frame for screen display.
   virtual void EndPrint() = 0;
 
-  // Initiates app cache selection for the context with the resource currently
-  // committed in the webframe.
-  virtual void SelectAppCacheWithoutManifest() = 0;
-  virtual void SelectAppCacheWithManifest(const GURL& manifest_url) = 0;
-
-  // Returns a pointer to the WebAppCacheContext for this frame.
-  virtual WebAppCacheContext* GetAppCacheContext() const = 0;
-
   // Only for test_shell
   virtual int PendingFrameUnloadEventCount() const = 0;
 
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index 3e418e7..2763334 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -154,7 +154,6 @@ MSVC_POP_WARNING();
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/dom_operations_private.h"
 #include "webkit/glue/glue_util.h"
-#include "webkit/glue/webappcachecontext.h"
 #include "webkit/glue/webdatasource_impl.h"
 #include "webkit/glue/webframe_impl.h"
 #include "webkit/glue/webtextinput_impl.h"
@@ -383,8 +382,7 @@ WebFrameImpl::WebFrameImpl()
     total_matchcount_(-1),
     frames_scoping_count_(-1),
     scoping_complete_(false),
-    next_invalidate_after_(0),
-    app_cache_context_(WebAppCacheContext::Create()) {
+    next_invalidate_after_(0) {
   StatsCounter(kWebFrameActiveCount).Increment();
   live_object_count_++;
 }
@@ -411,9 +409,6 @@ void WebFrameImpl::InitMainFrame(WebViewImpl* webview_impl) {
   // We must call init() after frame_ is assigned because it is referenced
   // during init().
   frame_->init();
-
-  // Inform the  browser process of this top-level frame
-  app_cache_context_->Initialize(WebAppCacheContext::MAIN_FRAME, NULL);
 }
 
 void WebFrameImpl::LoadRequest(const WebURLRequest& request) {
@@ -1734,10 +1729,6 @@ PassRefPtr<Frame> WebFrameImpl::CreateChildFrame(
   if (!child_frame->tree()->parent())
     return NULL;
 
-  // Inform the  browser process of this child frame
-  webframe->app_cache_context_->Initialize(WebAppCacheContext::CHILD_FRAME,
-                                           app_cache_context_.get());
-
   frame_->loader()->loadURLIntoChildFrame(
       request.resourceRequest().url(),
       request.resourceRequest().httpReferrer(),
@@ -1857,32 +1848,6 @@ float WebFrameImpl::PrintPage(int page, skia::PlatformCanvas* canvas) {
   return print_context_->spoolPage(spool, page);
 }
 
-void WebFrameImpl::SelectAppCacheWithoutManifest() {
-  WebDataSource* ds = GetDataSource();
-  DCHECK(ds);
-  if (ds->hasUnreachableURL()) {
-    app_cache_context_->SelectAppCacheWithoutManifest(
-                             ds->unreachableURL(),
-                             WebAppCacheContext::kNoAppCacheId);
-  } else {
-    const WebURLResponse& response = ds->response();
-    app_cache_context_->SelectAppCacheWithoutManifest(
-                             GetURL(),
-                             response.appCacheID());
-  }
-}
-
-void WebFrameImpl::SelectAppCacheWithManifest(const GURL &manifest_url) {
-  WebDataSource* ds = GetDataSource();
-  DCHECK(ds);
-  DCHECK(!ds->hasUnreachableURL());
-  const WebURLResponse& response = ds->response();
-  app_cache_context_->SelectAppCacheWithManifest(
-                           GetURL(),
-                           response.appCacheID(),
-                           manifest_url);
-}
-
 void WebFrameImpl::EndPrint() {
   DCHECK(print_context_.get());
   if (print_context_.get())
diff --git a/webkit/glue/webframe_impl.h b/webkit/glue/webframe_impl.h
index f91c06c..56c578c 100644
--- a/webkit/glue/webframe_impl.h
+++ b/webkit/glue/webframe_impl.h
@@ -181,12 +181,6 @@ class WebFrameImpl : public WebFrame, public base::RefCounted<WebFrameImpl> {
   virtual float PrintPage(int page, skia::PlatformCanvas* canvas);
   virtual void EndPrint();
 
-  virtual void SelectAppCacheWithoutManifest();
-  virtual void SelectAppCacheWithManifest(const GURL& manifest_url);
-  virtual WebAppCacheContext* GetAppCacheContext() const {
-    return app_cache_context_.get();
-  }
-
   PassRefPtr<WebCore::Frame> CreateChildFrame(
       const WebCore::FrameLoadRequest&,
       WebCore::HTMLFrameOwnerElement* owner_element);
@@ -401,9 +395,6 @@ class WebFrameImpl : public WebFrame, public base::RefCounted<WebFrameImpl> {
   // information. Is used by PrintPage().
   scoped_ptr<ChromePrintContext> print_context_;
 
-  // The app cache context for this frame.
-  scoped_ptr<WebAppCacheContext> app_cache_context_;
-
   // The input fields that are interested in edit events and their associated
   // listeners.
   typedef HashMap<RefPtr<WebCore::HTMLInputElement>,
diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc
index 6ea3315..89bc8d9 100644
--- a/webkit/glue/webframeloaderclient_impl.cc
+++ b/webkit/glue/webframeloaderclient_impl.cc
@@ -235,9 +235,6 @@ void WebFrameLoaderClient::dispatchWillSendRequest(
     WrappedResourceRequest webreq(request);
     d->WillSendRequest(webview, identifier, &webreq);
   }
-
-  request.setAppCacheContextID(
-              webframe_->GetAppCacheContext()->GetContextID());
 }
 
 bool WebFrameLoaderClient::shouldUseCredentialStorage(DocumentLoader*,
@@ -707,8 +704,6 @@ void WebFrameLoaderClient::dispatchDidReceiveTitle(const String& title) {
 }
 
 void WebFrameLoaderClient::dispatchDidCommitLoad() {
-  webframe_->SelectAppCacheWithoutManifest();
-
   WebViewImpl* webview = webframe_->GetWebViewImpl();
   bool is_new_navigation;
   webview->DidCommitLoad(&is_new_navigation);