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

chrome/browser/chromeos/proxy_config_service_impl_unittest.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 <map>
 #include <string>
 #include <vector>
 
@@ skipping 369 matching lines @@
     ProxyConfigServiceImpl::ProxyConfig init_config;
     SetAutomaticProxy(MK_MODE(DIRECT), MK_SRC(OWNER), NULL, &init_config,
                       &init_config.automatic_proxy);
     CreateConfigService(init_config);
 
     // Set config to tests[i].input via UI.
     net::ProxyBypassRules bypass_rules;
     const Input& input = tests[i].input;
     switch (input.mode) {
       case MK_MODE(DIRECT) :
-        EXPECT_EQ(tests[i].is_valid,
-                  config_service()->UISetProxyConfigToDirect());
+        config_service()->UISetProxyConfigToDirect();
         break;
       case MK_MODE(AUTO_DETECT) :
-        EXPECT_EQ(tests[i].is_valid,
-                  config_service()->UISetProxyConfigToAutoDetect());
+        config_service()->UISetProxyConfigToAutoDetect();
         break;
       case MK_MODE(PAC_SCRIPT) :
-        EXPECT_EQ(tests[i].is_valid,
-                  config_service()->UISetProxyConfigToPACScript(
-                      GURL(input.pac_url)));
+        config_service()->UISetProxyConfigToPACScript(GURL(input.pac_url));
         break;
       case MK_MODE(SINGLE_PROXY) :
-        EXPECT_EQ(tests[i].is_valid,
-                  config_service()->UISetProxyConfigToSingleProxy(
-                      net::ProxyServer::FromURI(input.single_uri,
-                                                MK_SCHM(HTTP))));
+        config_service()->UISetProxyConfigToSingleProxy(
+            net::ProxyServer::FromURI(input.single_uri, MK_SCHM(HTTP)));
         if (input.bypass_rules) {
           bypass_rules.ParseFromStringUsingSuffixMatching(input.bypass_rules);
-          EXPECT_EQ(tests[i].is_valid,
-                    config_service()->UISetProxyConfigBypassRules(
-                        bypass_rules));
+          config_service()->UISetProxyConfigBypassRules(bypass_rules);
         }
         break;
       case MK_MODE(PROXY_PER_SCHEME) :
         if (input.http_uri) {
-          EXPECT_EQ(tests[i].is_valid,
-              config_service()->UISetProxyConfigToProxyPerScheme("http",
-                  net::ProxyServer::FromURI(input.http_uri, MK_SCHM(HTTP))));
+          config_service()->UISetProxyConfigToProxyPerScheme("http",
+                  net::ProxyServer::FromURI(input.http_uri, MK_SCHM(HTTP)));
         }
         if (input.https_uri) {
-          EXPECT_EQ(tests[i].is_valid,
-              config_service()->UISetProxyConfigToProxyPerScheme("https",
-                  net::ProxyServer::FromURI(input.https_uri, MK_SCHM(HTTPS))));
+          config_service()->UISetProxyConfigToProxyPerScheme("https",
+              net::ProxyServer::FromURI(input.https_uri, MK_SCHM(HTTPS)));
         }
         if (input.ftp_uri) {
-          EXPECT_EQ(tests[i].is_valid,
-              config_service()->UISetProxyConfigToProxyPerScheme("ftp",
-                  net::ProxyServer::FromURI(input.ftp_uri, MK_SCHM(HTTP))));
+          config_service()->UISetProxyConfigToProxyPerScheme("ftp",
+              net::ProxyServer::FromURI(input.ftp_uri, MK_SCHM(HTTP)));
         }
         if (input.socks_uri) {
-          EXPECT_EQ(tests[i].is_valid,
-              config_service()->UISetProxyConfigToProxyPerScheme("socks",
-                  net::ProxyServer::FromURI(input.socks_uri, MK_SCHM(SOCKS4))));
+          config_service()->UISetProxyConfigToProxyPerScheme("socks",
+              net::ProxyServer::FromURI(input.socks_uri, MK_SCHM(SOCKS4)));
         }
         if (input.bypass_rules) {
           bypass_rules.ParseFromStringUsingSuffixMatching(input.bypass_rules);
-          EXPECT_EQ(tests[i].is_valid,
-              config_service()->UISetProxyConfigBypassRules(bypass_rules));
+          config_service()->UISetProxyConfigBypassRules(bypass_rules);
         }
         break;
     }
 
     // Retrieve config from IO thread.
     net::ProxyConfig io_config;
     SyncGetLatestProxyConfig(&io_config);
     EXPECT_EQ(tests[i].auto_detect, io_config.auto_detect());
     EXPECT_EQ(tests[i].pac_url, io_config.pac_url());
     EXPECT_TRUE(tests[i].proxy_rules.Matches(io_config.proxy_rules()));
@@ skipping 104 matching lines @@
       tgt_serializer.Serialize(*net_tgt_cfg.ToValue());
       LOG(INFO) << "source:\n" << src_output;
       LOG(INFO) << "target:\n" << tgt_output;
     }
 #endif  // !defined(NDEBUG)
     EXPECT_TRUE(net_src_cfg.Equals(net_tgt_cfg));
   }
 }
 
 }  // namespace chromeos