Translate Saved/StaticIPConfig properties from ONC to Shill

BUG=279351

Review URL: https://codereview.chromium.org/540613002

Cr-Commit-Position: refs/heads/master@{#293331}

3 files changed, 38 insertions, 2 deletions

diff --git a/components/onc/docs/onc_spec.html b/components/onc/docs/onc_spec.html
index 6822117..a3648c5 100644
--- a/components/onc/docs/onc_spec.html
+++ b/components/onc/docs/onc_spec.html
@@ -254,11 +254,31 @@
     <dt class="field">IPConfigs</dt>
     <dd>
       <span class="field_meta">
+        (optional for connected networks, read-only)
+        <span class="type">array of IPConfig</span>
+      </span>
+      Array of IPConfig properties associated with this connection.
+    </dd>
+
+    <dt class="field">StaticIPConfig</dt>
+    <dd>
+      <span class="field_meta">
         (optional if <span class="field">Remove</span> is
         <span class="value">false</span>, otherwise ignored)
-        <span class="type">array of IPConfig</span>
+        <span class="type">IPConfig</span>
       </span>
-      Static IPv4 or IPv6 parameters to associate with this connection.
+      Each property set in this IPConfig object overrides the respective
+      parameter received over DHCP.
+    </dd>
+
+    <dt class="field">SavedIPConfig</dt>
+    <dd>
+      <span class="field_meta">
+        (optional for connected networks, read-only)
+        <span class="type">IPConfig</span>
+      </span>
+      IPConfig property containing the configuration that was received from the
+      DHCP server prior to applying any StaticIPConfig parameters.
     </dd>
 
     <dt class="field">Name</dt>
@@ -532,6 +552,16 @@
       SearchDomains field for this configuration. If not specified, top level
       values will be used.
     </dd>
+
+    <dt class="field">WebProxyAutoDiscoveryUrl</dt>
+    <dd>
+      <span class="field_meta">
+        (optional if part of <span class="field">IPConfigs</span>)
+        <span class="type">string</span>
+      </span>
+      The Web Proxy Auto-Discovery URL for this network as reported over DHCP.
+    </dd>
+
   </dl>
 </section>
 
diff --git a/components/onc/onc_constants.cc b/components/onc/onc_constants.cc
index b7748b6..b522f7a 100644
--- a/components/onc/onc_constants.cc
+++ b/components/onc/onc_constants.cc
@@ -38,6 +38,8 @@ const char kDevice[] = "Device";
 const char kEthernet[] = "Ethernet";
 const char kGUID[] = "GUID";
 const char kIPConfigs[] = "IPConfigs";
+const char kSavedIPConfig[] = "SavedIPConfig";
+const char kStaticIPConfig[] = "StaticIPConfig";
 const char kMacAddress[] = "MacAddress";
 const char kName[] = "Name";
 const char kNameServers[] = "NameServers";
@@ -159,6 +161,7 @@ const char kIPv6[] = "IPv6";
 const char kNameServers[] = "NameServers";
 const char kRoutingPrefix[] = "RoutingPrefix";
 const char kType[] = "Type";
+const char kWebProxyAutoDiscoveryUrl[] = "WebProxyAutoDiscoveryUrl";
 }  // namespace ipconfig
 
 namespace wifi {
diff --git a/components/onc/onc_constants.h b/components/onc/onc_constants.h
index 3cea77f..3307795 100644
--- a/components/onc/onc_constants.h
+++ b/components/onc/onc_constants.h
@@ -62,6 +62,8 @@ ONC_EXPORT extern const char kDevice[];
 ONC_EXPORT extern const char kEthernet[];
 ONC_EXPORT extern const char kGUID[];
 ONC_EXPORT extern const char kIPConfigs[];
+ONC_EXPORT extern const char kSavedIPConfig[];
+ONC_EXPORT extern const char kStaticIPConfig[];
 ONC_EXPORT extern const char kMacAddress[];
 ONC_EXPORT extern const char kName[];
 ONC_EXPORT extern const char kNameServers[];
@@ -169,6 +171,7 @@ ONC_EXPORT extern const char kIPv6[];
 ONC_EXPORT extern const char kNameServers[];
 ONC_EXPORT extern const char kRoutingPrefix[];
 ONC_EXPORT extern const char kType[];
+ONC_EXPORT extern const char kWebProxyAutoDiscoveryUrl[];
 }  // namespace ipconfig
 
 namespace ethernet {