Merge 65401 - A bunch of proxy DOMUI changes....

chrome/browser/chromeos/cros_settings_provider_proxy.h

Index: chrome/browser/chromeos/cros_settings_provider_proxy.h
===================================================================
--- chrome/browser/chromeos/cros_settings_provider_proxy.h	(revision 65413)
+++ chrome/browser/chromeos/cros_settings_provider_proxy.h	(working copy)
@@ -26,12 +26,9 @@
 
   chromeos::ProxyConfigServiceImpl* GetConfigService() const;
 
-  void AppendPortIfValid(
-      const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy,
-      std::string* server_uri);
+  void AppendPortIfValid(const char* port_cache_key, std::string* server_uri);
 
-  bool FormServerUriIfValid(
-      const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy,
+  void FormServerUriIfValid(const char* host_cache_key,
       const std::string& port_num, std::string* server_uri);
 
   Value* CreateServerHostValue(
@@ -40,6 +37,11 @@
   Value* CreateServerPortValue(
       const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy) const;
 
+  void SetCache(const std::string& key, const Value* value);
+
+  // A cache to keep whatever user typed.
+  DictionaryValue cache_;
+
   DISALLOW_COPY_AND_ASSIGN(CrosSettingsProviderProxy);
 };