Fix chromeos::ProxyConfigService starting with the wrong ProxyConfig.

chromeos/network/proxy/proxy_config_service_impl.cc

 // Copyright (c) 2012 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 "chromeos/network/proxy/proxy_config_service_impl.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/location.h"
@@ skipping 37 matching lines @@
 
 }  // namespace
 
 ProxyConfigServiceImpl::ProxyConfigServiceImpl(
     PrefService* profile_prefs,
     PrefService* local_state_prefs,
     scoped_refptr<base::SingleThreadTaskRunner> io_task_runner)
     : PrefProxyConfigTrackerImpl(
           profile_prefs ? profile_prefs : local_state_prefs,
           io_task_runner),
-      active_config_state_(ProxyPrefs::CONFIG_UNSET),
       profile_prefs_(profile_prefs),
       local_state_prefs_(local_state_prefs),
       pointer_factory_(this) {
   const base::Closure proxy_change_callback = base::Bind(
       &ProxyConfigServiceImpl::OnProxyPrefChanged, base::Unretained(this));
 
   if (profile_prefs) {
     profile_pref_registrar_.Init(profile_prefs);
     profile_pref_registrar_.Add(::onc::prefs::kOpenNetworkConfiguration,
                                 proxy_change_callback);
@@ skipping 180 matching lines @@
     }
   }
 
   // Determine effective proxy config, either from prefs or network.
   ProxyPrefs::ConfigState effective_config_state;
   net::ProxyConfig effective_config;
   GetEffectiveProxyConfig(pref_state, pref_config, network_availability,
                           network_config, ignore_proxy, &effective_config_state,
                           &effective_config);
 
-  bool config_changed = active_config_state_ != effective_config_state ||
-                        (active_config_state_ != ProxyPrefs::CONFIG_UNSET &&
-                         !active_config_.Equals(effective_config));
-  if (config_changed) {  // Activate and store new effective config.
-    active_config_state_ = effective_config_state;
-    if (active_config_state_ != ProxyPrefs::CONFIG_UNSET)
-      active_config_ = effective_config;
-    // If effective config is from system (i.e. network), it's considered a
-    // special kind of prefs that ranks below policy/extension but above
-    // others, so bump it up to CONFIG_OTHER_PRECEDE to force its precedence
-    // when PrefProxyConfigTrackerImpl pushes it to ChromeProxyConfigService.
-    if (effective_config_state == ProxyPrefs::CONFIG_SYSTEM)
-      effective_config_state = ProxyPrefs::CONFIG_OTHER_PRECEDE;
-    // If config is manual, add rule to bypass local host.
-    if (effective_config.proxy_rules().type !=
-        net::ProxyConfig::ProxyRules::TYPE_NO_RULES) {
-      effective_config.proxy_rules().bypass_rules.AddRuleToBypassLocal();
-    }
-    PrefProxyConfigTrackerImpl::OnProxyConfigChanged(effective_config_state,
-                                                     effective_config);
-    if (VLOG_IS_ON(1)) {
-      std::unique_ptr<base::DictionaryValue> config_dict(
-          effective_config.ToValue());
-      VLOG(1) << this << ": Proxy changed: "
-              << ProxyPrefs::ConfigStateToDebugString(active_config_state_)
-              << ", " << *config_dict;
-    }
+  // If effective config is from system (i.e. network), it's considered a
+  // special kind of prefs that ranks below policy/extension but above
+  // others, so bump it up to CONFIG_OTHER_PRECEDE to force its precedence
+  // when PrefProxyConfigTrackerImpl pushes it to ChromeProxyConfigService.
+  if (effective_config_state == ProxyPrefs::CONFIG_SYSTEM)
+    effective_config_state = ProxyPrefs::CONFIG_OTHER_PRECEDE;
+  // If config is manual, add rule to bypass local host.
+  if (effective_config.proxy_rules().type !=
+      net::ProxyConfig::ProxyRules::TYPE_NO_RULES) {
+    effective_config.proxy_rules().bypass_rules.AddRuleToBypassLocal();
+  }
+  PrefProxyConfigTrackerImpl::OnProxyConfigChanged(effective_config_state,
+                                                   effective_config);
+  if (VLOG_IS_ON(1)) {
+    std::unique_ptr<base::DictionaryValue> config_dict(
+        effective_config.ToValue());
+    VLOG(1) << this << ": Proxy changed: "
+            << ProxyPrefs::ConfigStateToDebugString(effective_config_state)
+            << ", " << *config_dict;
   }
 }
 
 }  // namespace chromeos