redesign and reimplement proxy config service and tracker, revise proxy ui on cros

chrome/browser/net/proxy_service_factory.cc

Index: chrome/browser/net/proxy_service_factory.cc
===================================================================
--- chrome/browser/net/proxy_service_factory.cc	(revision 103881)
+++ chrome/browser/net/proxy_service_factory.cc	(working copy)
@@ -7,8 +7,8 @@
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/pref_proxy_config_service.h"
-#include "chrome/browser/io_thread.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/browser/browser_thread.h"
 #include "net/base/net_log.h"
@@ -29,24 +29,25 @@
   // from the UI thread.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
+#if defined(OS_CHROMEOS)
+  return new chromeos::ProxyConfigService(
+      g_browser_process->chromeos_proxy_config_service_impl(),

[Mattias Nissler (ping if slow), 2011/10/07 13:32:10]

Ah, so here is the other location where the per-profile-ness of proxy config
bites you, which you have tried to avoid by pushing the pref settings from the
tracker through chromeos::ProxyConfigService to chromes::ProxyConfigServiceImpl.
Actually, that approach is incorrect without multi-profile being enabled
already, since the different chromeos::ProxyConfigService instances (one for the
system request context, one for the main profile) may have conflicting proxy
configs they forward to chromeos::ProxyConfigServiceImpl.

I think the solution is to just create a chromeos::ProxyConfigServiceImpl per
profile (and another one for the system request context).

[kuan, 2011/10/18 16:25:35]

this and related classes have been re-designed and re-implemented.

+      proxy_config_tracker);
+#else
   // Create a baseline service that provides proxy configuration in case nothing
   // is configured through prefs (Note: prefs include command line and
   // configuration policy).
-  net::ProxyConfigService* base_service = NULL;
 
   // TODO(port): the IO and FILE message loops are only used by Linux.  Can
   // that code be moved to chrome/browser instead of being in net, so that it
   // can use BrowserThread instead of raw MessageLoop pointers? See bug 25354.
-#if defined(OS_CHROMEOS)
-  base_service = new chromeos::ProxyConfigService(
-      g_browser_process->chromeos_proxy_config_service_impl());
-#else
-  base_service = net::ProxyService::CreateSystemProxyConfigService(
-      g_browser_process->io_thread()->message_loop(),
-      g_browser_process->file_thread()->message_loop());
-#endif  // defined(OS_CHROMEOS)
+  net::ProxyConfigService* base_service =
+      net::ProxyService::CreateSystemProxyConfigService(
+          g_browser_process->io_thread()->message_loop(),
+          g_browser_process->file_thread()->message_loop());
 
   return new PrefProxyConfigService(proxy_config_tracker, base_service);
+#endif  // defined(OS_CHROMEOS)
 }
 
 // static