1 files changed, 9 insertions, 16 deletions
diff --git a/tools/inspector_protocol/lib/base_string_adapter_h.template b/tools/inspector_protocol/lib/base_string_adapter_h.template
index b0215e0745..8bf3c355c0 100644
--- a/tools/inspector_protocol/lib/base_string_adapter_h.template
+++ b/tools/inspector_protocol/lib/base_string_adapter_h.template
@@ -32,16 +32,6 @@ class Value;
 using String = std::string;
 using ProtocolMessage = std::string;
 
-class {{config.lib.export_macro}} StringUTF8Adapter {
- public:
-  StringUTF8Adapter(const std::string& string) : string_(string) { }
-  const char* Data() const { return string_.data(); }
-  size_t length() const { return string_.length(); }
-
- private:
-  const std::string& string_;
-};
-
 class {{config.lib.export_macro}} StringBuilder {
  public:
   StringBuilder();
@@ -109,6 +99,15 @@ class {{config.lib.export_macro}} StringUtil {
   static String fromUTF8(const uint8_t* data, size_t length) {
     return std::string(reinterpret_cast<const char*>(data), length);
   }
+
+  static String fromUTF16(const uint16_t* data, size_t length);
+
+  static const uint8_t* CharactersLatin1(const String& s) { return nullptr; }
+  static const uint8_t* CharactersUTF8(const String& s) {
+    return reinterpret_cast<const uint8_t*>(s.data());
+  }
+  static const uint16_t* CharactersUTF16(const String& s) { return nullptr; }
+  static size_t CharacterCount(const String& s) { return s.size(); }
 };
 
 // A read-only sequence of uninterpreted bytes with reference-counted storage.
@@ -137,12 +136,6 @@ class {{config.lib.export_macro}} Binary {
 
 std::unique_ptr<Value> toProtocolValue(const base::Value* value, int depth);
 std::unique_ptr<base::Value> toBaseValue(Value* value, int depth);
-
-bool AppendStringValueToMapBinary(base::StringPiece in,
-    base::StringPiece key, base::StringPiece value, std::string* out);
-bool AppendStringValueToMapJSON(base::StringPiece in,
-    base::StringPiece key, base::StringPiece value, std::string* out);
-
 {% for namespace in config.protocol.namespace %}
 } // namespace {{namespace}}
 {% endfor %}