Extending the translation from ONC to Shill.

chromeos/network/onc/onc_utils.h

Index: chromeos/network/onc/onc_utils.h
diff --git a/chromeos/network/onc/onc_utils.h b/chromeos/network/onc/onc_utils.h
index 13263a826ae442efaa4470b3f31f212b904b4820..060cb6723b107205d84e7f55a7397c22cd0b0e5c 100644
--- a/chromeos/network/onc/onc_utils.h
+++ b/chromeos/network/onc/onc_utils.h
@@ -7,9 +7,11 @@
 
 #include <string>
 
+#include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "chromeos/chromeos_export.h"
 #include "chromeos/network/onc/onc_constants.h"
+#include "chromeos/network/onc/onc_signature.h"
 
 namespace base {
 class DictionaryValue;
@@ -38,7 +40,21 @@ CHROMEOS_EXPORT scoped_ptr<base::DictionaryValue> Decrypt(
 // For logging only: strings not user facing.
 CHROMEOS_EXPORT std::string GetSourceAsString(ONCSource source);
 
-}  // chromeos
+class CHROMEOS_EXPORT StringSubstitution {
+ public:
+  StringSubstitution() {}
+  virtual bool GetSubstitute(std::string placeholder,
+                             std::string* substitute) = 0;
+ private:
+  DISALLOW_COPY_AND_ASSIGN(StringSubstitution);
+};
+
+CHROMEOS_EXPORT void ExpandStringsInOncObject(
+    const OncValueSignature& signature,
+    StringSubstitution* substitution,
+    base::DictionaryValue* onc_object);
+
 }  // onc
+}  // chromeos
 
 #endif  // CHROMEOS_NETWORK_ONC_ONC_UTILS_H_