diff options
| author | danno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-12 12:47:05 +0000 |
|---|---|---|
| committer | danno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-12 12:47:05 +0000 |
| commit | ac7f3fdb4987d7f44c1612d55437cfcb3eb263f6 (patch) | |
| tree | c017e812bb298f7f2c7341372ab62021df3c8a29 /chrome_frame | |
| parent | bb33eb1e2468eacb996e19493a36c3f6e4625b12 (diff) | |
| download | chromium_src-ac7f3fdb4987d7f44c1612d55437cfcb3eb263f6.zip chromium_src-ac7f3fdb4987d7f44c1612d55437cfcb3eb263f6.tar.gz chromium_src-ac7f3fdb4987d7f44c1612d55437cfcb3eb263f6.tar.bz2 | |
Support specifying the GSSAPI library that will be used.
This preference can be set either via command-line or via group policy.
BUG=53625
TEST=unittests: ConfigurationPolicyPrefStore*; net_unittests: HttpAuthHandlerNegotiateTest.*:HttpAuthGSSAPIPOSIXTest.*; manually: start Chrome with command-line switch --gssapi-library-name=XYZ and see if this results in the Chrome process loading /usr/lib/whatever/XYZ as soon as an authenticated HTTP site is encountered.
Review URL: http://codereview.chromium.org/4560001
Patch from Jakob Kummerow <jkummerow@google.com>.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65939 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/metrics_service.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome_frame/metrics_service.cc b/chrome_frame/metrics_service.cc index fd52b8a..eecf468 100644 --- a/chrome_frame/metrics_service.cc +++ b/chrome_frame/metrics_service.cc @@ -42,8 +42,10 @@ #include <atlbase.h> #include <atlwin.h> -#include <windows.h> #include <objbase.h> +#include <windows.h> + +#include <vector> #if defined(USE_SYSTEM_LIBBZ2) #include <bzlib.h> @@ -168,8 +170,8 @@ class ChromeFrameUploadRequestContext : public URLRequestContext { base::SplitString(csv_auth_schemes, ',', &supported_schemes); http_auth_handler_factory_ = net::HttpAuthHandlerRegistryFactory::Create( - supported_schemes, url_security_manager_.get(), host_resolver_, false, - false); + supported_schemes, url_security_manager_.get(), host_resolver_, + std::string(), false, false); http_transaction_factory_ = new net::HttpCache( net::HttpNetworkLayer::CreateFactory(host_resolver_, |