Remove default proxy service tweaking in ChromeOS login.

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/compiler_specific.h"
@@ skipping 15 matching lines @@
 #include "chrome/browser/chromeos/input_method/input_method_manager.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/login_display_host.h"
 #include "chrome/browser/chromeos/login/ownership_service.h"
 #include "chrome/browser/chromeos/login/parallel_authenticator.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/policy/browser_policy_connector.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"
 #include "chrome/browser/ui/browser_init.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
 #include "chrome/common/net/gaia/gaia_urls.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
+#include "net/base/cookie_monster.h"
 #include "net/base/cookie_store.h"
-#include "net/base/cookie_monster.h"
-#include "net/proxy/proxy_config_service.h"
-#include "net/proxy/proxy_service.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/gfx/gl/gl_switches.h"
 
 namespace chromeos {
 
 namespace {
 
 // Affixes for Auth token received from ClientLogin request.
 const char kAuthPrefix[] = "Auth=";
 const char kAuthSuffix[] = "\n";
 
 // Increase logging level for Guest mode to avoid LOG(INFO) messages in logs.
 const char kGuestModeLoggingLevel[] = "1";
 
 // Format of command line switch.
 const char kSwitchFormatString[] = " --%s=\"%s\"";
 
 // User name which is used in the Guest session.
 const char kGuestUserName[] = "";
 
 }  // namespace
 
-// Resets the proxy configuration service for the default request context.
-class ResetDefaultProxyConfigServiceTask : public Task {
- public:
-  ResetDefaultProxyConfigServiceTask(
-      net::ProxyConfigService* proxy_config_service)
-      : proxy_config_service_(proxy_config_service) {}
-  virtual ~ResetDefaultProxyConfigServiceTask() {}
-
-  // Task override.
-  virtual void Run() {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-    // TODO(willchan): Move this class back into the anonymous namespace after
-    // we stop using this deprecated API.
-    net::URLRequestContextGetter* getter =
-        Profile::Deprecated::GetDefaultRequestContext();
-    DCHECK(getter);
-    if (getter) {
-      getter->GetURLRequestContext()->proxy_service()->ResetConfigService(
-          proxy_config_service_.release());
-    }
-  }
-
- private:
-  scoped_ptr<net::ProxyConfigService> proxy_config_service_;
-
-  DISALLOW_COPY_AND_ASSIGN(ResetDefaultProxyConfigServiceTask);
-};
-
 // Transfer the inital set of Profile cookies form the default profile.
 class TransferDefaultCookiesOnIOThreadTask : public Task {
  public:
   TransferDefaultCookiesOnIOThreadTask(
       net::URLRequestContextGetter* default_context,
       net::URLRequestContextGetter* new_context)
       : default_context_(default_context),
         new_context_(new_context) {}
   virtual ~TransferDefaultCookiesOnIOThreadTask() {}
 
@@ skipping 181 matching lines @@
   // Initialize the user-policy backend.
   policy::BrowserPolicyConnector* browser_policy_connector =
       g_browser_process->browser_policy_connector();
   browser_policy_connector->InitializeUserPolicy(username_,
                                                  profile->GetPath(),
                                                  profile->GetTokenService());
 
   BootTimesLoader* btl = BootTimesLoader::Get();
   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(
-              g_browser_process->chromeos_proxy_config_service_impl()));
-  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 PrepareProfile.
   // For existing users there's usually a pending online auth request.
   // Cookies will be fetched after it's is succeeded.
   if (!pending_requests_) {
     if (CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kWebUIGaiaLogin)) {
       // Transfer cookies from the profile that was used for authentication.
       // This profile contains cookies that auth extension should have already
       // put in place that will ensure that the newly created session is
@@ skipping 356 matching lines @@
   // Mark login host for deletion after browser starts.  This
   // guarantees that the message loop will be referenced by the
   // browser before it is dereferenced by the login host.
   if (login_host) {
     login_host->OnSessionStart();
     login_host = NULL;
   }
 }
 
 }  // namespace chromeos