arc: update proxy settings from UI and ONC policy.

chrome/browser/chromeos/proxy_config_service_impl.h

Index: chrome/browser/chromeos/proxy_config_service_impl.h
diff --git a/chrome/browser/chromeos/proxy_config_service_impl.h b/chrome/browser/chromeos/proxy_config_service_impl.h
index 93586a08c2b6695d7b5f5bcf134eef67e4628ac2..2f73d910eb261add51188b0b8ff5f809a6958688 100644
--- a/chrome/browser/chromeos/proxy_config_service_impl.h
+++ b/chrome/browser/chromeos/proxy_config_service_impl.h
@@ -54,15 +54,19 @@ class ProxyConfigServiceImpl : public PrefProxyConfigTrackerImpl,
   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.