Fix layering of ApplicationCacheHost

Source/core/loader/appcache/ApplicationCacheHostInternal.h

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 10 matching lines @@
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "WebApplicationCacheHostClient.h"
-#include "WebFrameClient.h"
-#include "WebFrameImpl.h"
+#include "core/frame/Frame.h"
 #include "core/loader/DocumentLoader.h"
+#include "core/loader/FrameLoader.h"
+#include "core/loader/FrameLoaderClient.h"
 #include "core/loader/appcache/ApplicationCacheHost.h"
+#include "public/platform/WebApplicationCacheHostClient.h"
 #include "public/platform/WebURL.h"
 
 namespace WebCore {
 
+// FIXME: This class should go away and WebCore::ApplicationCacheHost should implement blink::WebApplicationCacheHostClient
 class ApplicationCacheHostInternal FINAL : public blink::WebApplicationCacheHostClient {
 public:
     ApplicationCacheHostInternal(ApplicationCacheHost* host)
         : m_innerHost(host)
     {
-        blink::WebFrameImpl* webFrame = blink::WebFrameImpl::fromFrame(host->m_documentLoader->frame());
-        ASSERT(webFrame);
-        m_outerHost = adoptPtr(webFrame->client()->createApplicationCacheHost(webFrame, this));
+        Frame* frame = host->m_documentLoader->frame();
+        ASSERT(frame);
+        ASSERT(frame->loader().client());
+        m_outerHost = frame->loader().client()->createApplicationCacheHost(this);
     }
 
     virtual void didChangeCacheAssociation() OVERRIDE
     {
         // FIXME: Prod the inspector to update it's notion of what cache the page is using.
     }
 
     virtual void notifyEventListener(blink::WebApplicationCacheHost::EventID eventID) OVERRIDE
     {
         m_innerHost->notifyApplicationCache(static_cast<ApplicationCacheHost::EventID>(eventID), 0, 0);
@@ skipping 11 matching lines @@
         return 0;
     }
 
 private:
     friend class ApplicationCacheHost;
     ApplicationCacheHost* m_innerHost;
     OwnPtr<blink::WebApplicationCacheHost> m_outerHost;
 };
 
 }