| Index: chrome/browser/io_thread.cc
|
| diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
|
| index ab30a18c5aa2542b5b0c507834419a87ff6f7e1d..ab21b5e46b6ebf24ea874b91461ed6ed2e904206 100644
|
| --- a/chrome/browser/io_thread.cc
|
| +++ b/chrome/browser/io_thread.cc
|
| @@ -130,6 +130,7 @@
|
|
|
| #if defined(OS_CHROMEOS)
|
| #include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h"
|
| +#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
|
| #include "chromeos/network/host_resolver_impl_chromeos.h"
|
| #endif
|
|
|
| @@ -389,6 +390,11 @@ IOThread::IOThread(
|
| #if defined(OS_POSIX) && !defined(OS_ANDROID)
|
| gssapi_library_name_ = local_state->GetString(prefs::kGSSAPILibraryName);
|
| #endif
|
| +#if defined(OS_CHROMEOS)
|
| + policy::BrowserPolicyConnectorChromeOS* connector =
|
| + g_browser_process->platform_part()->browser_policy_connector_chromeos();
|
| + allow_gssapi_library_load_ = connector->IsActiveDirectoryManaged();
|
| +#endif
|
| pref_proxy_config_tracker_.reset(
|
| ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
|
| local_state));
|
| @@ -780,6 +786,10 @@ void IOThread::CreateDefaultAuthHandlerFactory() {
|
| ,
|
| gssapi_library_name_
|
| #endif
|
| +#if defined(OS_CHROMEOS)
|
| + ,
|
| + allow_gssapi_library_load_
|
| +#endif
|
| ));
|
| UpdateServerWhitelist();
|
| UpdateDelegateWhitelist();
|
|
|