Merge 65401 - A bunch of proxy DOMUI changes....

chrome/browser/chromeos/proxy_config_service_impl.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/chromeos/proxy_config_service_impl.h"
 
 #include <ostream>
 
 #include "base/logging.h"
 #include "base/string_util.h"
@@ skipping 391 matching lines @@
   reference_config_.mode = ProxyConfig::MODE_AUTO_DETECT;
   OnUISetProxyConfig(true);
   return true;
 }
 
 bool ProxyConfigServiceImpl::UISetProxyConfigToPACScript(const GURL& pac_url) {
   // Should be called from UI thread.
   CheckCurrentlyOnUIThread();
   reference_config_.mode = ProxyConfig::MODE_PAC_SCRIPT;
   reference_config_.automatic_proxy.pac_url = pac_url;
-  if (pac_url.is_valid()) {
-    OnUISetProxyConfig(true);
-    return true;
-  }
-  LOG(INFO) << "Cannot set proxy: invalid pac url";
-  return false;
+  OnUISetProxyConfig(true);
+  return true;
 }
 
 bool ProxyConfigServiceImpl::UISetProxyConfigToSingleProxy(
     const net::ProxyServer& server) {
   // Should be called from UI thread.
   CheckCurrentlyOnUIThread();
   reference_config_.mode = ProxyConfig::MODE_SINGLE_PROXY;
   reference_config_.single_proxy.server = server;
-  if (server.is_valid()) {
-    OnUISetProxyConfig(true);
-    return true;
-  }
-  LOG(INFO) << "Cannot set proxy: invalid single server";
-  return false;
+  OnUISetProxyConfig(true);
+  return true;
 }
 
 bool ProxyConfigServiceImpl::UISetProxyConfigToProxyPerScheme(
     const std::string& scheme, const net::ProxyServer& server) {
   // Should be called from UI thread.
   CheckCurrentlyOnUIThread();
   ProxyConfig::ManualProxy* proxy = NULL;
   if (scheme == "http")
     proxy = &reference_config_.http_proxy;
   else if (scheme == "https")
     proxy = &reference_config_.https_proxy;
   else if (scheme == "ftp")
     proxy = &reference_config_.ftp_proxy;
   else if (scheme == "socks")
     proxy = &reference_config_.socks_proxy;
   if (!proxy) {
     NOTREACHED() << "Cannot set proxy: invalid scheme [" << scheme << "]";
     return false;
   }
   reference_config_.mode = ProxyConfig::MODE_PROXY_PER_SCHEME;
   proxy->server = server;
-  if (server.is_valid()) {
-    OnUISetProxyConfig(true);
-    return true;
-  }
-  LOG(INFO) << "Cannot set proxy: invalid " << scheme << " server";
-  return false;
+  OnUISetProxyConfig(true);
+  return true;
 }
 
 bool ProxyConfigServiceImpl::UISetProxyConfigBypassRules(
     const net::ProxyBypassRules& bypass_rules) {
   // Should be called from UI thread.
   CheckCurrentlyOnUIThread();
   DCHECK(reference_config_.mode == ProxyConfig::MODE_SINGLE_PROXY ||
          reference_config_.mode == ProxyConfig::MODE_PROXY_PER_SCHEME);
   if (reference_config_.mode != ProxyConfig::MODE_SINGLE_PROXY &&
       reference_config_.mode != ProxyConfig::MODE_PROXY_PER_SCHEME) {
@@ skipping 127 matching lines @@
   has_config_ = true;
   cached_config_ = new_config;
   // Notify observers of new proxy config.
   net::ProxyConfig net_config;
   cached_config_.ToNetProxyConfig(&net_config);
   FOR_EACH_OBSERVER(net::ProxyConfigService::Observer, observers_,
                     OnProxyConfigChanged(net_config));
 }
 
 }  // namespace chromeos