| Index: android_webview/browser/net/init_native_callback.h
|
| diff --git a/android_webview/browser/net/init_native_callback.h b/android_webview/browser/net/init_native_callback.h
|
| index 69855b6c2694b6184924adbea86126a3da91195d..71da42bf610f07ac6f5bbf464465e6d670058207 100644
|
| --- a/android_webview/browser/net/init_native_callback.h
|
| +++ b/android_webview/browser/net/init_native_callback.h
|
| @@ -6,21 +6,28 @@
|
| #define ANDROID_WEBVIEW_BROWSER_NET_INIT_NATIVE_CALLBACK_H_
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "net/url_request/url_request_job_factory.h"
|
|
|
| namespace net {
|
| class URLRequestContext;
|
| -class URLRequestJobFactory;
|
| } // namespace net
|
|
|
| namespace android_webview {
|
| -class AwURLRequestJobFactory;
|
|
|
| // This is called on the IO thread when the network URLRequestContext has been
|
| // initialized but not used. Note that the UI thread is blocked during this
|
| // call.
|
| -scoped_ptr<net::URLRequestJobFactory> CreateAndroidJobFactoryAndCookieMonster(
|
| - net::URLRequestContext* context,
|
| - scoped_ptr<AwURLRequestJobFactory> job_factory);
|
| +void CreateCookieMonster(net::URLRequestContext* context);
|
| +
|
| +// This is called on the IO thread when the network URLRequestContext has been
|
| +// initialized but not used.
|
| +scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| + CreateAndroidAssetFileProtocolHandler();
|
| +
|
| +// This is called on the IO thread when the network URLRequestContext has been
|
| +// initialized but not used.
|
| +scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| + CreateAndroidContentProtocolHandler();
|
|
|
| } // namespace android_webview
|
|
|
|
|