Revert 154452 "Refactoring: Introduce ResouceLoaderHost interfac..."

Revert 154452 "Refactoring: Introduce ResouceLoaderHost interfac..."

> Refactoring: Introduce ResouceLoaderHost interface for unloading ResourceLoader.
> 
> This moves several direct dependencies of ResourceLoader into
> newly inroduced ResouceLoaderHost interface, which is implemented by
> CachedResourceLoader.
> 
> The motivation here is to make ResourceLoader working without DocumentLoader
> and FrameLoader so that scripts can be loaded through imported documents, which
> doesn't have a DocumentLoader.
> 
> Note that CachedResourceLoader already lives without DocumentLoader in some case,
> thus it is natural to localize such kind of complication there and keep ResourceLoader
> straightforward.
> 
> BUG=240592
> TEST=none
> R=japhet@chromium.org
> 
> Review URL: https://codereview.chromium.org/19574002

TBR=morrita@chromium.org

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=154458

[tkent, 2013-07-18 02:24:01]

Committed patchset #1 manually as r154458.

[tkent, 2013-07-18 02:26:54]

I forgot to add a reason.  It broke Windows and Mac debug build.


FAILED: ninja -t msvc -e environment.x86 -- "c:\Program Files (x86)\Microsoft
Visual Studio 10.0\VC\bin\cl.exe" /nologo /showIncludes /FC
@obj\third_party\webkit\source\core\loader\cache\webkit_unit_tests.cachedimagetest.obj.rsp
/c ..\..\third_party\WebKit\Source\core\loader\cache\CachedImageTest.cpp
/Foobj\third_party\webkit\source\core\loader\cache\webkit_unit_tests.cachedimagetest.obj
/Fdobj\third_party\WebKit\Source\WebKit\chromium\webkit_unit_tests.pdb 
c:\b\build\slave\webkit-win-latest-rel\build\src\third_party\webkit\source\core\loader\resourceloaderhost.h(40)
:error C2220: warning treated as error - no 'object' file generated
c:\b\build\slave\webkit-win-latest-rel\build\src\third_party\webkit\source\core\loader\resourceloaderhost.h(40)
: warning C4099: 'WebCore::CachedResourceInitiatorInfo' : type name first seen
using 'struct' now seen using 'class'
       
c:\b\build\slave\webkit-win-latest-rel\build\src\third_party\webkit\source\core\loader\cache\cachedresourceinitiatorinfo.h(34)
: see declaration of 'WebCore::CachedResourceInitiatorInfo'
c:\b\build\slave\webkit-win-latest-rel\build\src\third_party\webkit\source\core\loader\resourceloaderhost.h(44)
: warning C4099: 'WebCore::ResourceLoaderOptions' : type name first seen using
'struct' now seen using 'class'
       
c:\b\build\slave\webkit-win-latest-rel\build\src\third_party\webkit\source\core\loader\resourceloaderoptions.h(80)
: see declaration of 'WebCore::ResourceLoaderOptions'



FAILED: clang++ -MMD -MF
obj/third_party/webkit/source/core/loader/cache/webkit.cachedimagetest.o.d
-DANGLE_DX11 -DCHROMIUM_BUILD -DCOMPONENT_BUILD -DUSE_LIBJPEG_TURBO=1
-DENABLE_ONE_CLICK_SIGNIN -DENABLE_REMOTING=1 -DENABLE_WEBRTC=1
-DENABLE_PEPPER_CDMS -DENABLE_CONFIGURATION_POLICY -DENABLE_INPUT_SPEECH
-DENABLE_NOTIFICATIONS -DENABLE_HIDPI=1 -DENABLE_GPU=1 -DENABLE_EGLIMAGE=1
-DENABLE_TASK_MANAGER=1 -DENABLE_EXTENSIONS=1 -DENABLE_PLUGIN_INSTALLATION=1
-DENABLE_PLUGINS=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_THEMES=1
-DENABLE_AUTOFILL_DIALOG=1 -DENABLE_BACKGROUND=1 -DENABLE_AUTOMATION=1
-DENABLE_GOOGLE_NOW=1 -DENABLE_LANGUAGE_DETECTION=1 -DENABLE_PRINTING=1
-DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_APP_LIST=1 -DENABLE_SETTINGS_APP=1
-DENABLE_MANAGED_USERS=1 -DWEBKIT_IMPLEMENTATION=1 -DINSIDE_WEBKIT
-DENABLE_CSS3_TEXT=0 -DENABLE_CSS_EXCLUSIONS=1 -DENABLE_CSS_REGIONS=1
-DENABLE_CUSTOM_SCHEME_HANDLER=0 -DENABLE_ENCRYPTED_MEDIA_V2=1
-DENABLE_SVG_FONTS=1 -DENABLE_TOUCH_ICON_LOADING=0
-DENABLE_GDI_FONTS_ON_WINDOWS=1 -DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1
-DENABLE_CALENDAR_PICKER=1 -DENABLE_INPUT_SPEECH=1
-DENABLE_INPUT_MULTIPLE_FIELDS_UI=1 -DENABLE_LEGACY_NOTIFICATIONS=1
-DENABLE_MEDIA_CAPTURE=0 -DENABLE_NAVIGATOR_CONTENT_UTILS=1
-DENABLE_NOTIFICATIONS=1 -DENABLE_ORIENTATION_EVENTS=0 -DENABLE_WEB_AUDIO=1
-DENABLE_RUBBER_BANDING=1 -DWTF_USE_NEW_THEME=1 -DSK_BUILD_NO_IMAGE_ENCODE
-DSK_DEFERRED_CANVAS_USES_GPIPE=1
'-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"'
-DGR_AGGRESSIVE_SHADER_OPTS=1 -DSK_ENABLE_INST_COUNT=0 -DSK_USE_POSIX_THREADS
-DGR_DLL -DSKIA_DLL -DU_USING_ICU_NAMESPACE=0 -DV8_SHARED -DUSING_V8_SHARED
-DUNIT_TEST -DGTEST_HAS_RTTI=0 -DCHROME_PNG_WRITE_SUPPORT -DPNG_USER_CONFIG
-DLIBXML_STATIC -DLIBXSLT_STATIC -DNO_NSPR_10_SUPPORT -DNSS_ENABLE_ECC
-DNSS_STATIC -DNSS_USE_STATIC_LIBS -DUSE_UTIL_DIRECTLY -D__STDC_CONSTANT_MACROS
-D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED=1
-DWTF_USE_DYNAMIC_ANNOTATIONS=1 -I../../third_party/icu/public/i18n
-I../../third_party/icu/public/common -I../../third_party/WebKit/public/web
-I../../third_party/WebKit/Source/web -I../../third_party/angle_dx11/include
-I../../third_party/skia/include/utils
-I../../third_party/WebKit/Source/core/testing/v8
-I../../third_party/WebKit/public/web/mac -I../../third_party/khronos
-I../../gpu -I../.. -I../../third_party/WebKit -I../../third_party/WebKit/Source
-Igen/webkit -Igen/webkit/bindings
-I../../third_party/WebKit/Source/WebKit/mac/WebCoreSupport
-I../../third_party/qcms/src -I../../skia/config
-I../../third_party/skia/src/core -I../../third_party/skia/include/config
-I../../third_party/skia/include/core -I../../third_party/skia/include/effects
-I../../third_party/skia/include/pdf -I../../third_party/skia/include/gpu
-I../../third_party/skia/include/gpu/gl -I../../third_party/skia/include/lazy
-I../../third_party/skia/include/pathops -I../../third_party/skia/include/pipe
-I../../third_party/skia/include/ports -I../../skia/ext
-I../../third_party/skia/include/utils/mac -I../../third_party/npapi
-I../../third_party/npapi/bindings -I../../v8/include
-I../../testing/gmock/include -I../../testing/gtest/include
-I../../third_party/libjpeg_turbo -I../../third_party/libpng
-I../../third_party/libwebp -I../../third_party/libxml/mac/include
-I../../third_party/libxml/src/include -I../../third_party/libxslt
-I../../third_party/ots/include -I../../third_party/zlib
-I../../third_party/nss/nspr/pr/include -I../../third_party/nss/nspr/lib/ds
-I../../third_party/nss/nspr/lib/libc/include
-I../../third_party/nss/nss/lib/base -I../../third_party/nss/nss/lib/certdb
-I../../third_party/nss/nss/lib/certhigh
-I../../third_party/nss/nss/lib/cryptohi -I../../third_party/nss/nss/lib/dev
-I../../third_party/nss/nss/lib/freebl
-I../../third_party/nss/nss/lib/freebl/ecl -I../../third_party/nss/nss/lib/nss
-I../../third_party/nss/nss/lib/pk11wrap -I../../third_party/nss/nss/lib/pkcs7
-I../../third_party/nss/nss/lib/pki -I../../third_party/nss/nss/lib/smime
-I../../third_party/nss/nss/lib/softoken -I../../third_party/nss/nss/lib/util
-isysroot /Developer/SDKs/MacOSX10.6.sdk -O0 -gdwarf-2 -fno-strict-aliasing
-fvisibility=hidden -Werror -Wnewline-eof -mmacosx-version-min=10.6 -arch i386
-Wall -Wendif-labels -Wextra -Wno-unused-parameter
-Wno-missing-field-initializers -Wheader-hygiene -Wno-c++11-narrowing
-Wno-reserved-user-defined-literal -Wno-char-subscripts -Wno-unused-function
-Wno-covered-switch-default -Wstring-conversion -Wno-deprecated-register
-Wexit-time-destructors -fno-rtti -fno-exceptions -fvisibility-inlines-hidden
-fno-threadsafe-statics -Xclang -load -Xclang
/Volumes/data/b/build/slave/webkit-mac-latest-dbg/build/src/tools/clang/scripts/../../../third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib
-Xclang -add-plugin -Xclang find-bad-constructs -fcolor-diagnostics
-fstack-protector-all -std=gnu++11  -c
../../third_party/WebKit/Source/core/loader/cache/CachedImageTest.cpp -o
obj/third_party/webkit/source/core/loader/cache/webkit.cachedimagetest.o
In file included from
../../third_party/WebKit/Source/core/loader/cache/CachedImageTest.cpp:38:
In file included from
../../third_party/WebKit/Source/core/loader/cache/CachedResourceLoader.h:29:
../../third_party/WebKit/Source/core/loader/ResourceLoaderHost.h:40:1:error:
class 'CachedResourceInitiatorInfo' was previously declared as a struct
[-Werror,-Wmismatched-tags]
class CachedResourceInitiatorInfo;
^
../../third_party/WebKit/Source/core/loader/cache/CachedResourceInitiatorInfo.h:34:8:
note: previous use is here
struct CachedResourceInitiatorInfo {
       ^
../../third_party/WebKit/Source/core/loader/ResourceLoaderHost.h:40:1: note: did
you mean struct here?
class CachedResourceInitiatorInfo;
^~~~~
struct
../../third_party/WebKit/Source/core/loader/ResourceLoaderHost.h:44:1:error:
class 'ResourceLoaderOptions' was previously declared as a struct
[-Werror,-Wmismatched-tags]
class ResourceLoaderOptions;
^
../../third_party/WebKit/Source/core/loader/ResourceLoaderOptions.h:80:8: note:
previous use is here
struct ResourceLoaderOptions {
       ^
../../third_party/WebKit/Source/core/loader/ResourceLoaderHost.h:44:1: note: did
you mean struct here?
class ResourceLoaderOptions;
^~~~~
struct