It turns out that we can just use the versions of IconLoader.cpp and

IconDatabaseNone.cpp from third_party/WebKit.  Our forked version of
IconLoader.cpp was unnecessary because FrameLoader does not start the
IconLoader if the IconDatabase is not enabled.  IconDatabaseNone says
it is not enabled!

R=dglazkov

Review URL: http://codereview.chromium.org/14051

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6894 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 108 deletions

diff --git a/webkit/port/loader/IconLoader.cpp b/webkit/port/loader/IconLoader.cpp
deleted file mode 100644
index 26c6c6cb..0000000
--- a/webkit/port/loader/IconLoader.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2006 Apple Computer, 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. 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 "config.h"
-
-#if COMPILER(MSVC)
-__pragma(warning(push, 0))
-#endif
-#include "IconLoader.h"
-
-#include "Document.h"
-#include "Frame.h"
-#include "FrameLoader.h"
-#include "FrameLoaderClient.h"
-#include "IconDatabase.h"
-#include "Logging.h"
-#include "ResourceHandle.h"
-#include "ResourceResponse.h"
-#include "ResourceRequest.h"
-#include "SubresourceLoader.h"
-#if COMPILER(MSVC)
-__pragma(warning(pop))
-#endif
-
-using namespace std;
-
-namespace WebCore {
-
-// This is a stub implementation of WebKit's IconLoader class that does
-// nothing.
-
-IconLoader::IconLoader(Frame* frame)
-    : m_frame(frame)
-    , m_loadIsInProgress(false)
-{
-}
-
-// TODO(brettw) it may be we want to hook our icon loading framework up to here
-// instead of being in the RenderView. This may make for easier integration in
-// the future.
-auto_ptr<IconLoader> IconLoader::create(Frame* frame)
-{
-    return auto_ptr<IconLoader>(new IconLoader(frame));
-}
-
-IconLoader::~IconLoader()
-{
-}
-
-void IconLoader::startLoading()
-{
-}
-
-void IconLoader::stopLoading()
-{
-}
-
-void IconLoader::didReceiveResponse(SubresourceLoader* resourceLoader, const ResourceResponse& response)
-{
-}
-
-void IconLoader::didReceiveData(SubresourceLoader* loader, const char*, int size)
-{
-}
-
-void IconLoader::didFail(SubresourceLoader* resourceLoader, const ResourceError&)
-{
-}
-
-void IconLoader::didFinishLoading(SubresourceLoader* resourceLoader)
-{
-}
-
-void IconLoader::didReceiveAuthenticationChallenge(SubresourceLoader* resourceLoader, const AuthenticationChallenge& challenge)
-{
-}
-
-void IconLoader::finishLoading(const KURL& iconURL, PassRefPtr<SharedBuffer> data)
-{
-}
-
-void IconLoader::clearLoadingState()
-{
-}
-
-}  // namespace WebCore