arc: update proxy settings from UI and ONC policy.

chrome/browser/chromeos/proxy_config_service_impl.cc

Index: chrome/browser/chromeos/proxy_config_service_impl.cc
diff --git a/chrome/browser/chromeos/proxy_config_service_impl.cc b/chrome/browser/chromeos/proxy_config_service_impl.cc
index ce977fee3daed5876c7e796f91d9dc31050df8c3..aead4c5fb2760dc131ae33699c611ca452a8d09c 100644
--- a/chrome/browser/chromeos/proxy_config_service_impl.cc
+++ b/chrome/browser/chromeos/proxy_config_service_impl.cc
@@ -9,6 +9,7 @@
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/logging.h"
+#include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/net/proxy_config_handler.h"
@@ -22,6 +23,7 @@
 #include "components/prefs/pref_service.h"
 #include "components/proxy_config/pref_proxy_config_tracker_impl.h"
 #include "components/proxy_config/proxy_config_dictionary.h"
+#include "components/proxy_config/proxy_config_pref_names.h"
 #include "components/proxy_config/proxy_prefs.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/browser_thread.h"
@@ -173,6 +175,45 @@ bool ProxyConfigServiceImpl::IgnoreProxy(const PrefService* profile_prefs,
   return !use_shared_proxies;
 }
 
+// static
+std::unique_ptr<ProxyConfigDictionary>
+ProxyConfigServiceImpl::GetDefaultProxyConfigDictionary(
+    const PrefService* profile_prefs) {
+  const chromeos::NetworkState* network = chromeos::NetworkHandler::Get()
+                                              ->network_state_handler()
+                                              ->DefaultNetwork();
+  if (network) {
+    // Apply Pref Proxy configuration if available.
+    net::ProxyConfig pref_proxy_config;
+    ProxyPrefs::ConfigState pref_state =
+        PrefProxyConfigTrackerImpl::ReadPrefConfig(profile_prefs,
+                                                   &pref_proxy_config);
+    if (PrefProxyConfigTrackerImpl::PrefPrecedes(pref_state)) {
+      const PrefService::Preference* const pref =
+          profile_prefs->FindPreference(::proxy_config::prefs::kProxy);
+      const base::DictionaryValue* proxy_config_value;
+      bool value_exists =
+          pref->GetValue()->GetAsDictionary(&proxy_config_value);
+      DCHECK(value_exists);
+
+      return base::MakeUnique<ProxyConfigDictionary>(proxy_config_value);
+    }

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

This section doesn't depend on |network|. We should move it before the
DefaultNetwork() call, unless we only want to return a proxy result if we are
connected to a network in which case I would early exit if !network and add a
comment.

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

Done.

+
+    // Apply network proxy configuration.
+    ::onc::ONCSource onc_source;
+    std::unique_ptr<ProxyConfigDictionary> proxy_config =
+        chromeos::proxy_config::GetProxyConfigForNetwork(
+            profile_prefs, g_browser_process->local_state(), *network,
+            &onc_source);
+    if (!chromeos::ProxyConfigServiceImpl::IgnoreProxy(
+            profile_prefs, network->profile_path(), onc_source))
+      return proxy_config;
+  }
+
+  return base::MakeUnique<ProxyConfigDictionary>(
+      ProxyConfigDictionary::CreateDirect());
+}
+
 void ProxyConfigServiceImpl::DetermineEffectiveConfigFromDefaultNetwork() {
   if (!NetworkHandler::IsInitialized())
     return;