Fix layering of ApplicationCacheHost

Source/core/loader/appcache/ApplicationCacheHostInternal.h

Index: Source/core/loader/appcache/ApplicationCacheHostInternal.h
diff --git a/Source/web/ApplicationCacheHostInternal.h b/Source/core/loader/appcache/ApplicationCacheHostInternal.h
similarity index 85%
rename from Source/web/ApplicationCacheHostInternal.h
rename to Source/core/loader/appcache/ApplicationCacheHostInternal.h
index c77f922fff73a898dfe018c39fd2e69970bd84f2..c614d866bcb16eaddef08c39cadeadb17e8f5538 100644
--- a/Source/web/ApplicationCacheHostInternal.h
+++ b/Source/core/loader/appcache/ApplicationCacheHostInternal.h
@@ -28,23 +28,26 @@
  * 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