| Index: android_webview/native/net_init_native_callback.cc
|
| diff --git a/android_webview/native/net_init_native_callback.cc b/android_webview/native/net_init_native_callback.cc
|
| index 585282f06b4232cad7b77bc4b0831818a43144c3..69cd5f30bd91d3c3baab2244f9529d86f25ec98a 100644
|
| --- a/android_webview/native/net_init_native_callback.cc
|
| +++ b/android_webview/native/net_init_native_callback.cc
|
| @@ -7,16 +7,22 @@
|
| #include "android_webview/browser/net/aw_url_request_job_factory.h"
|
| #include "android_webview/native/android_protocol_handler.h"
|
| #include "android_webview/native/cookie_manager.h"
|
| -#include "net/url_request/url_request_job_factory.h"
|
|
|
| namespace android_webview {
|
| class AwURLRequestJobFactory;
|
|
|
| -scoped_ptr<net::URLRequestJobFactory> CreateAndroidJobFactoryAndCookieMonster(
|
| - net::URLRequestContext* context,
|
| - scoped_ptr<AwURLRequestJobFactory> job_factory) {
|
| +scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| +CreateAndroidAssetFileProtocolHandler() {
|
| + return CreateAssetFileProtocolHandler();
|
| +}
|
| +
|
| +scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| +CreateAndroidContentProtocolHandler() {
|
| + return CreateContentSchemeProtocolHandler();
|
| +}
|
| +
|
| +void CreateCookieMonster(net::URLRequestContext* context) {
|
| SetCookieMonsterOnNetworkStackInit(context);
|
| - return CreateAndroidRequestJobFactory(job_factory.Pass());
|
| }
|
|
|
| } // namespace android_webview
|
|
|