Fix chromeos::ProxyConfigService starting with the wrong ProxyConfig.

components/proxy_config/pref_proxy_config_tracker_impl.h

 // 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.
 
 #ifndef COMPONENTS_PROXY_CONFIG_PREF_PROXY_CONFIG_TRACKER_IMPL_H_
 #define COMPONENTS_PROXY_CONFIG_PREF_PROXY_CONFIG_TRACKER_IMPL_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "base/threading/thread_checker.h"
 #include "components/prefs/pref_change_registrar.h"
 #include "components/proxy_config/pref_proxy_config_tracker.h"
 #include "components/proxy_config/proxy_config_dictionary.h"
 #include "net/proxy/proxy_config.h"
 #include "net/proxy/proxy_config_service.h"
 
 class PrefService;
 class PrefRegistrySimple;
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
-namespace user_prefs {
-class PrefRegistrySyncable;
-}
-
 // A net::ProxyConfigService implementation that applies preference proxy
 // settings (pushed from PrefProxyConfigTrackerImpl) as overrides to the proxy
 // configuration determined by a baseline delegate ProxyConfigService on
 // non-ChromeOS platforms. ChromeOS has its own implementation of overrides in
 // chromeos::ProxyConfigServiceImpl.
 class ProxyConfigServiceImpl : public net::ProxyConfigService,
                                public net::ProxyConfigService::Observer {
  public:
   ProxyConfigServiceImpl(std::unique_ptr<net::ProxyConfigService> base_service,
                          ProxyPrefs::ConfigState initial_config_state,
@@ skipping 78 matching lines @@
       net::ProxyConfig* effective_config);
 
   // Converts a ProxyConfigDictionary to net::ProxyConfig representation.
   // Returns true if the data from in the dictionary is valid, false otherwise.
   static bool PrefConfigToNetConfig(const ProxyConfigDictionary& proxy_dict,
                                     net::ProxyConfig* config);
 
   // Registers the proxy preferences. These are actually registered
   // the same way in local state and in user prefs.
   static void RegisterPrefs(PrefRegistrySimple* registry);
-  static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
+  static void RegisterProfilePrefs(PrefRegistrySimple* registry);
 
   // Creates a proxy configuration from proxy-related preferences of
   // |pref_service|. Configuration is stored in |config|, return value indicates
   // whether the configuration is valid.
   static ProxyPrefs::ConfigState ReadPrefConfig(const PrefService* pref_service,
                                                 net::ProxyConfig* config);
 
  protected:
   // Get the proxy configuration currently defined by preferences.
   // Status is indicated in the return value.
   // Writes the configuration to |config| unless the return value is
   // CONFIG_UNSET, in which case |config| and |config_source| are not touched.
   ProxyPrefs::ConfigState GetProxyConfig(net::ProxyConfig* config);
 
   // Called when there's a change in prefs proxy config.
   // Subclasses can extend it for changes in other sources of proxy config.
+  // Checks new config against old config, and if there was no change, does
+  // nothing.
   virtual void OnProxyConfigChanged(ProxyPrefs::ConfigState config_state,
                                     const net::ProxyConfig& config);
 
   void OnProxyPrefChanged();
 
   const PrefService* prefs() const { return pref_service_; }
 
  private:
   // Tracks configuration state. |pref_config_| is valid only if |config_state_|
   // is not CONFIG_UNSET.
-  ProxyPrefs::ConfigState config_state_;
+  ProxyPrefs::ConfigState pref_config_state_;
 
   // Configuration as defined by prefs.
   net::ProxyConfig pref_config_;
 
   PrefService* pref_service_;
   ProxyConfigServiceImpl* proxy_config_service_impl_;  // Weak ptr.
   PrefChangeRegistrar proxy_prefs_;
 
+  // State of |active_config_|.  |active_config_| is only valid if
+  // |active_config_state_| is not ProxyPrefs::CONFIG_UNSET.
+  ProxyPrefs::ConfigState active_config_state_;
+
+  // Active proxy configuration, last received from OnProxyConfigChanged.
+  net::ProxyConfig active_config_;
+
   scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
 
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefProxyConfigTrackerImpl);
 };
 
 #endif  // COMPONENTS_PROXY_CONFIG_PREF_PROXY_CONFIG_TRACKER_IMPL_H_