Cleanup the UseSharedProxies preference.

chrome/browser/net/proxy_service_factory.cc

 // Copyright (c) 2012 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/net/proxy_service_factory.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/pref_proxy_config_tracker.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/net_log.h"
 #include "net/proxy/dhcp_proxy_script_fetcher_factory.h"
 #include "net/proxy/proxy_config_service.h"
 #include "net/proxy/proxy_script_fetcher_impl.h"
 #include "net/proxy/proxy_service.h"
 #include "net/proxy/proxy_service_v8.h"
 #include "net/url_request/url_request_context.h"
 
 #if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
 #endif  // defined(OS_CHROMEOS)
 
 using content::BrowserThread;
 
 // static
 ChromeProxyConfigService* ProxyServiceFactory::CreateProxyConfigService() {
   // The linux gconf-based proxy settings getter relies on being initialized
   // from the UI thread.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 16 matching lines @@
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO).get(),
       BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::FILE));
 #endif  // !defined(OS_CHROMEOS)
 
   return new ChromeProxyConfigService(base_service);
 }
 
 #if defined(OS_CHROMEOS)
 // static
 chromeos::ProxyConfigServiceImpl*
-    ProxyServiceFactory::CreatePrefProxyConfigTracker(
-        PrefService* pref_service) {
-  return new chromeos::ProxyConfigServiceImpl(pref_service);
+ProxyServiceFactory::CreatePrefProxyConfigTracker(Profile* profile) {
+  return new chromeos::ProxyConfigServiceImpl(
+      chromeos::ProfileHelper::IsSigninProfile(profile),
+      profile->GetPrefs(),
+      g_browser_process->local_state());
 }
 #else
 // static
 PrefProxyConfigTrackerImpl* ProxyServiceFactory::CreatePrefProxyConfigTracker(
-    PrefService* pref_service) {
-  return new PrefProxyConfigTrackerImpl(pref_service);
+    Profile* profile) {
+  return new PrefProxyConfigTrackerImpl(profile->GetPrefs());
 }
 #endif  // defined(OS_CHROMEOS)
 
 // static
+PrefProxyConfigTrackerImpl*
+ProxyServiceFactory::CreatePrefProxyConfigTrackerForLocalState(
+    PrefService* pref_service) {
+#if defined(OS_CHROMEOS)
+  return new chromeos::ProxyConfigServiceImpl(false, NULL, pref_service);
+#else
+  return new PrefProxyConfigTrackerImpl(pref_service);
+#endif  // defined(OS_CHROMEOS)
+}
+
+// static
 net::ProxyService* ProxyServiceFactory::CreateProxyService(
     net::NetLog* net_log,
     net::URLRequestContext* context,
     net::NetworkDelegate* network_delegate,
     net::ProxyConfigService* proxy_config_service,
     const CommandLine& command_line) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
 #if defined(OS_IOS)
   bool use_v8 = false;
@@ skipping 43 matching lines @@
 #endif  // defined(OS_IOS)
   } else {
     proxy_service = net::ProxyService::CreateUsingSystemProxyResolver(
         proxy_config_service,
         num_pac_threads,
         net_log);
   }
 
   return proxy_service;
 }