chromeos: 1st draft of ProxyConfigService for chromeos...

chrome/browser/net/chrome_url_request_context.cc

 // Copyright (c) 2010 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/chrome_url_request_context.h"
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/string_number_conversions.h"
@@ skipping 22 matching lines @@
 #include "net/proxy/proxy_config_service_fixed.h"
 #include "net/proxy/proxy_script_fetcher.h"
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_request.h"
 #include "webkit/glue/webkit_glue.h"
 
 #if defined(USE_NSS)
 #include "net/ocsp/nss_ocsp.h"
 #endif
 
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/proxy_config_service.h"
+#endif  // defined(OS_CHROMEOS)
+
 namespace {
 
 // ----------------------------------------------------------------------------
 // Helper methods to check current thread
 // ----------------------------------------------------------------------------
 
 void CheckCurrentlyOnIOThread() {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
 }
 
 void CheckCurrentlyOnMainThread() {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
 }
 
 // ----------------------------------------------------------------------------
 // Helper methods to initialize proxy
 // ----------------------------------------------------------------------------
 
-net::ProxyConfigService* CreateProxyConfigService(
-    const PrefService* pref_service) {
+net::ProxyConfigService* CreateProxyConfigService(Profile* profile) {
   // The linux gconf-based proxy settings getter relies on being initialized
   // from the UI thread.
   CheckCurrentlyOnMainThread();
 
-  scoped_ptr<net::ProxyConfig> proxy_config(CreateProxyConfig(pref_service));
+  scoped_ptr<net::ProxyConfig> proxy_config(CreateProxyConfig(
+      profile->GetPrefs()));
 
   if (!proxy_config.get()) {
     // Use system settings.
     // 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 ChromeThread instead of raw MessageLoop pointers? See bug 25354.
+#if defined(OS_CHROMEOS)
+    return new chromeos::ProxyConfigService(
+        profile->GetChromeOSProxyConfigServiceImpl());
+#else
     return net::ProxyService::CreateSystemProxyConfigService(
         g_browser_process->io_thread()->message_loop(),
         g_browser_process->file_thread()->message_loop());
+#endif  // defined(OS_CHROMEOS)
   }
 
   // Otherwise use the fixed settings from the command line.
   return new net::ProxyConfigServiceFixed(*proxy_config.get());
 }
 
 // Create a proxy service according to the options on command line.
 net::ProxyService* CreateProxyService(
     net::NetLog* net_log,
     URLRequestContext* context,
@@ skipping 131 matching lines @@
                      const FilePath& cookie_store_path,
                      const FilePath& disk_cache_path,
                      int cache_size)
       : ChromeURLRequestContextFactory(profile),
         cookie_store_path_(cookie_store_path),
         disk_cache_path_(disk_cache_path),
         cache_size_(cache_size),
         // We need to initialize the ProxyConfigService from the UI thread
         // because on linux it relies on initializing things through gconf,
         // and needs to be on the main thread.
-        proxy_config_service_(CreateProxyConfigService(profile->GetPrefs())) {
+        proxy_config_service_(CreateProxyConfigService(profile)) {
   }
 
   virtual ChromeURLRequestContext* Create();
 
  private:
   FilePath cookie_store_path_;
   FilePath disk_cache_path_;
   int cache_size_;
 
   scoped_ptr<net::ProxyConfigService> proxy_config_service_;
@@ skipping 812 matching lines @@
       prefs::kProxyAutoDetect));
 
   if (pref_service->HasPrefPath(prefs::kProxyBypassList)) {
     std::string proxy_bypass =
         pref_service->GetString(prefs::kProxyBypassList);
     proxy_config->proxy_rules().bypass_rules.ParseFromString(proxy_bypass);
   }
 
   return proxy_config;
 }