Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1153)

Unified Diff: chrome/browser/chromeos/login/login_utils.cc

Issue 6549007: Make CrOS proxy configuration write prefs directly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove default request context proxy config service patch. Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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.
« no previous file with comments | « no previous file | chrome/browser/chromeos/proxy_config_service.h » ('j') | chrome/browser/chromeos/proxy_config_service_impl.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698