| Index: chrome/browser/chromeos/login/login_utils.cc
|
| diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc
|
| index 224ef1e09fbd24111da623b1100c5e3b2a7c60b8..635bf8feaa2e950b37cfa76b3189952d17b56235 100644
|
| --- a/chrome/browser/chromeos/login/login_utils.cc
|
| +++ b/chrome/browser/chromeos/login/login_utils.cc
|
| @@ -32,7 +32,6 @@
|
| #include "chrome/browser/chromeos/login/parallel_authenticator.h"
|
| #include "chrome/browser/chromeos/login/user_image_downloader.h"
|
| #include "chrome/browser/chromeos/login/user_manager.h"
|
| -#include "chrome/browser/chromeos/proxy_config_service.h"
|
| #include "chrome/browser/extensions/extension_service.h"
|
| #include "chrome/browser/net/chrome_url_request_context.h"
|
| #include "chrome/browser/net/gaia/token_service.h"
|
| @@ -239,28 +238,6 @@ void LoginUtilsImpl::CompleteLogin(
|
| }
|
| btl->AddLoginTimeMarker("UserProfileGotten", false);
|
|
|
| - // Change the proxy configuration service of the default request context to
|
| - // use the preference configuration from the logged-in profile. This ensures
|
| - // that requests done through the default context use the proxy configuration
|
| - // provided by configuration policy.
|
| - //
|
| - // Note: Many of the clients of the default request context should probably be
|
| - // fixed to use the request context of the profile they are associated with.
|
| - // This includes preconnect, autofill, metrics service to only name a few;
|
| - // see http://code.google.com/p/chromium/issues/detail?id=64339 for details.
|
| - //
|
| - // TODO(mnissler) Revisit when support for device-specific policy arrives, at
|
| - // which point the default request context can directly be managed through
|
| - // device policy.
|
| - net::ProxyConfigService* proxy_config_service =
|
| - new PrefProxyConfigService(
|
| - profile->GetProxyConfigTracker(),
|
| - new chromeos::ProxyConfigService(
|
| - profile->GetChromeOSProxyConfigServiceImpl()));
|
| - BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
|
| - new ResetDefaultProxyConfigServiceTask(
|
| - proxy_config_service));
|
| -
|
| // Since we're doing parallel authentication, only new user sign in
|
| // would perform online auth before calling CompleteLogin.
|
| // For existing users there's usually a pending online auth request.
|
|
|