Make CrOS proxy configuration write prefs directly.

chrome/browser/chromeos/login/login_utils.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/login_utils.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 14 matching lines @@
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/login/background_view.h"
 #include "chrome/browser/chromeos/login/cookie_fetcher.h"
 #include "chrome/browser/chromeos/login/google_authenticator.h"
 #include "chrome/browser/chromeos/login/language_switch_menu.h"
 #include "chrome/browser/chromeos/login/ownership_service.h"
 #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"
 #include "chrome/browser/net/preconnect.h"
 #include "chrome/browser/net/pref_proxy_config_service.h"
 #include "chrome/browser/plugin_updater.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/profile_sync_service.h"
@@ skipping 186 matching lines @@
   {
     // Loading user profile causes us to do blocking IO on UI thread.
     // Temporarily allow it until we fix http://crosbug.com/11104
     base::ThreadRestrictions::ScopedAllowIO allow_io;
     // The default profile will have been changed because the ProfileManager
     // will process the notification that the UserManager sends out.
     profile = profile_manager->GetDefaultProfile(user_data_dir);
   }
   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.
   // Cookies will be fetched after it's is succeeded.
   if (!pending_requests) {
     FetchCookies(profile, credentials);
   }
 
   // Init extension event routers; this normally happens in browser_main
   // but on Chrome OS it has to be deferred until the user finishes
@@ skipping 300 matching lines @@
   BrowserInit browser_init;
   int return_code;
   browser_init.LaunchBrowser(*CommandLine::ForCurrentProcess(),
                              profile,
                              FilePath(),
                              true,
                              &return_code);
 }
 
 }  // namespace chromeos