Make CrOS proxy configuration write prefs directly.

chrome/browser/profiles/profile_io_data.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/profiles/profile_io_data.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
+#include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/chrome_cookie_notification_details.h"
 #include "chrome/browser/net/pref_proxy_config_service.h"
+#include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/prefs/pref_service.h"
-#include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "net/http/http_util.h"
 #include "net/proxy/proxy_config_service_fixed.h"
 #include "net/proxy/proxy_script_fetcher_impl.h"
 #include "net/proxy/proxy_service.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/libcros_service_library.h"
-#include "chrome/browser/chromeos/proxy_config_service.h"
 #endif  // defined(OS_CHROMEOS)
 
 namespace {
 
 // ----------------------------------------------------------------------------
 // CookieMonster::Delegate implementation
 // ----------------------------------------------------------------------------
 class ChromeCookieMonsterDelegate : public net::CookieMonster::Delegate {
  public:
   explicit ChromeCookieMonsterDelegate(Profile* profile) {
@@ skipping 224 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // 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(
-      profile->GetChromeOSProxyConfigServiceImpl());
-#else
+#if !defined(OS_CHROMEOS)
   base_service = net::ProxyService::CreateSystemProxyConfigService(
       g_browser_process->io_thread()->message_loop(),
       g_browser_process->file_thread()->message_loop());
 #endif  // defined(OS_CHROMEOS)

[kuan, 2011/02/22 22:20:25]

chromeos has no base_service? this would mean that the very initial config used
for PrefProxyConfigService must be same as that retrieved in
ProxyCrosSettingsProvider::GetConfigService.  the former uses net::ProxyConfig
in the prefs, whose default is DIRECT connection, but the latter uses
AUTO_DETECT for default.  will this cause the ui and backend to differ? 

nit: if it turns out i'm wrong, the comment "// defined" shld be "// !defined"

[Mattias Nissler (ping if slow), 2011/03/01 15:19:20]

It's intentional that ChromeOS now doesn't have base service any longer, since
it'll feed the configuration directly via local_state prefs.

That wrong default in PrefProxyConfigService was really a mistake on my side, I
originally intended to put the gold default, which is auto configuration.

 
   return new PrefProxyConfigService(profile->GetProxyConfigTracker(),
                                     base_service);
 }
 
 // static
 net::ProxyService* ProfileIOData::CreateProxyService(
     net::NetLog* net_log,
     net::URLRequestContext* context,
     net::ProxyConfigService* proxy_config_service,
@@ skipping 41 matching lines @@
 
 #if defined(OS_CHROMEOS)
   if (chromeos::CrosLibrary::Get()->EnsureLoaded()) {
     chromeos::CrosLibrary::Get()->GetLibCrosServiceLibrary()->
         RegisterNetworkProxyHandler(proxy_service);
   }
 #endif  // defined(OS_CHROMEOS)
 
   return proxy_service;
 }