Merge branch 'master' into chrome51
Conflicts: browser/url_request_context_getter.cc browser/url_request_context_getter.h
This commit is contained in:
commit
e23ffd1694
2 changed files with 20 additions and 58 deletions
|
@ -35,7 +35,7 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
|
|||
public:
|
||||
class Delegate {
|
||||
public:
|
||||
Delegate();
|
||||
Delegate() {}
|
||||
virtual ~Delegate() {}
|
||||
|
||||
virtual net::NetworkDelegate* CreateNetworkDelegate() { return NULL; }
|
||||
|
@ -47,28 +47,6 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
|
|||
const base::FilePath& base_path);
|
||||
virtual std::unique_ptr<net::CertVerifier> CreateCertVerifier();
|
||||
virtual net::SSLConfigService* CreateSSLConfigService();
|
||||
virtual bool AllowNTLMCredentialsForDomain(const GURL& auth_origin);
|
||||
virtual bool CanDelegateURLSecurity(const GURL& auth_origin);
|
||||
|
||||
private:
|
||||
std::unique_ptr<net::URLSecurityManager> orig_url_sec_mgr_;
|
||||
};
|
||||
|
||||
class DelegateURLSecurityManager : public net::URLSecurityManager {
|
||||
public:
|
||||
DelegateURLSecurityManager(URLRequestContextGetter::Delegate* delegate);
|
||||
|
||||
bool CanUseDefaultCredentials(const GURL& auth_origin) const override;
|
||||
bool CanDelegate(const GURL& auth_origin) const override;
|
||||
void SetDefaultWhitelist(
|
||||
std::unique_ptr<net::HttpAuthFilter> whitelist_default) override;
|
||||
void SetDelegateWhitelist(
|
||||
std::unique_ptr<net::HttpAuthFilter> whitelist_delegate) override;
|
||||
|
||||
private:
|
||||
URLRequestContextGetter::Delegate* delegate_;
|
||||
|
||||
DISALLOW_COPY_AND_ASSIGN(DelegateURLSecurityManager);
|
||||
};
|
||||
|
||||
URLRequestContextGetter(
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue