Fix chromeos::ProxyConfigServiceImpl not setting ProxyConfig on start.

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 238 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);
 
-  // Activate effective proxy and store into |active_config_|.
-  // If last update didn't complete, we definitely update now.
-  bool update_now = update_pending();
-  if (!update_now) {  // Otherwise, only update now if there're changes.
-    update_now = active_config_state_ != effective_config_state ||
-                 (active_config_state_ != ProxyPrefs::CONFIG_UNSET &&
-                  !active_config_.Equals(effective_config));
-  }
-  if (update_now) {  // Activate and store new 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) && !update_pending()) {  // Update was successful.
+    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;
     }
   }
 }
 
 }  // namespace chromeos