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..fd47d952fa90f949ce239910b7e37da2dfa8cad3 100644
--- a/chrome/browser/chromeos/proxy_config_service_impl.h
+++ b/chrome/browser/chromeos/proxy_config_service_impl.h
@@ -54,15 +54,17 @@ 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 a default network for this network
+  // profile. |profile_prefs| must be not NULL.

[stevenjb, 2016/09/06 15:49:06]

s/a default network/the default network/

Also, 'for this network profile' is confusing. I would omit it, or say 'for the
currently active network profile', but that is generally always the case.

It is also unclear in the implementation whether we should return the pref proxy
config if no network is connected. We should make that clear in this comment and
maybe in the name, e.g. if we only return the config if we are connected to a
network, maybe name this GetProxyConfigDictionaryForActiveNetwork().

[Polina Bondarenko, 2016/09/06 19:38:46]

I'd return pref proxy config regardless the network is active. According to the
current implementation, if there is no network and proxy pref changes, ARC will
not be notified about the change at all, even after the network becomes active.

+  static std::unique_ptr<ProxyConfigDictionary> GetDefaultProxyConfigDictionary(
+      const PrefService* profile_prefs);
 
  private:
   // Called when any proxy preference changes.