Update from https://crrev.com/311076

net/proxy/proxy_info_unittest.cc

Index: net/proxy/proxy_info_unittest.cc
diff --git a/net/proxy/proxy_info_unittest.cc b/net/proxy/proxy_info_unittest.cc
index 09f5ef60b1f52bb7c0c97c51f5bca086f41a0586..06a0497e4f940cd2c3b3aa783e620bfac9fe56e4 100644
--- a/net/proxy/proxy_info_unittest.cc
+++ b/net/proxy/proxy_info_unittest.cc
@@ -3,7 +3,9 @@
 // found in the LICENSE file.
 
 #include "net/base/net_errors.h"
+#include "net/proxy/proxy_config.h"
 #include "net/proxy/proxy_info.h"
+#include "net/proxy/proxy_list.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
@@ -41,4 +43,19 @@ TEST(ProxyInfoTest, ProxyInfoIsDirectOnly) {
 }
 
 }  // namespace
+
+TEST(ProxyInfoTest, UseVsOverrideProxyList) {
+  ProxyInfo info;
+  info.config_id_ = 99;
+  ProxyList proxy_list;
+  proxy_list.Set("http://foo.com");
+  info.OverrideProxyList(proxy_list);
+  EXPECT_EQ(99, info.config_id_);
+  EXPECT_EQ("PROXY foo.com:80", info.proxy_list().ToPacString());
+  proxy_list.Set("http://bar.com");
+  info.UseProxyList(proxy_list);
+  EXPECT_EQ(0, info.config_id_);
+  EXPECT_EQ("PROXY bar.com:80", info.proxy_list().ToPacString());
+}
+
 }  // namespace net