arc: update proxy settings from UI and ONC policy.

chrome/browser/chromeos/proxy_config_service_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 CHROME_BROWSER_CHROMEOS_PROXY_CONFIG_SERVICE_IMPL_H_
 #define CHROME_BROWSER_CHROMEOS_PROXY_CONFIG_SERVICE_IMPL_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 36 matching lines @@
   ~ProxyConfigServiceImpl() override;
 
   // PrefProxyConfigTrackerImpl implementation.
   void OnProxyConfigChanged(ProxyPrefs::ConfigState config_state,
                             const net::ProxyConfig& config) override;
 
   // NetworkStateHandlerObserver implementation.
   void DefaultNetworkChanged(const NetworkState* network) override;
   void OnShuttingDown() override;
 
- protected:
-  friend class UIProxyConfigService;
-
   // Returns true if proxy is to be ignored for this network profile and
   // |onc_source|, e.g. this happens if the network is shared and
   // use-shared-proxies is turned off. |profile_prefs| may be NULL.
   static bool IgnoreProxy(const PrefService* profile_prefs,
                           const std::string network_profile_path,
-                          onc::ONCSource onc_source);
+                          ::onc::ONCSource onc_source);
+
+  // Returns a proxy config dictionary of the default network. If there is no
+  // active connected network, returns the pref proxy configuration if any and
+  // NULL otherwise.

[stevenjb, 2016/09/12 19:59:25]

This comment does not seem to be accurate. We "Apply Pref Proxy configuration if
available" first.

[Polina Bondarenko, 2016/09/12 20:49:05]

Fixed a little bit. This method returns Pref Proxy configuration if configured
regardless a connected network.

+  // |profile_prefs| must be not NULL.
+  static std::unique_ptr<ProxyConfigDictionary> GetDefaultProxyConfigDictionary(

[stevenjb, 2016/09/12 19:59:25]

I think that with the current logic, "Default" is confusing. I would just name
this GetProxyConfigDictionary, or maybe GetActiveProxyConfigDictionary.

[Polina Bondarenko, 2016/09/12 20:49:05]

Fixed.

+      const PrefService* profile_prefs);
 
  private:
   // Called when any proxy preference changes.
   void OnProxyPrefChanged();
 
   // Determines effective proxy config based on prefs from config tracker, the
   // current default network and if user is using shared proxies.  The effective
   // config is stored in |active_config_| and activated on network stack, and
   // hence, picked up by observers.
   void DetermineEffectiveConfigFromDefaultNetwork();
@@ skipping 20 matching lines @@
   PrefService* local_state_prefs_;
 
   base::WeakPtrFactory<ProxyConfigServiceImpl> pointer_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceImpl);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_PROXY_CONFIG_SERVICE_IMPL_H_