[DevTools] Reduce API surface of String16.

third_party/WebKit/Source/platform/inspector_protocol/String16WTF.h

Index: third_party/WebKit/Source/platform/inspector_protocol/String16WTF.h
diff --git a/third_party/WebKit/Source/platform/inspector_protocol/String16WTF.h b/third_party/WebKit/Source/platform/inspector_protocol/String16WTF.h
index 19c56256f0dec481d1c3255351a1d19e9cee65c6..1552c4bc3a8a574e2769c687db43fa9af9372c83 100644
--- a/third_party/WebKit/Source/platform/inspector_protocol/String16WTF.h
+++ b/third_party/WebKit/Source/platform/inspector_protocol/String16WTF.h
@@ -24,7 +24,16 @@ public:
     String16(const UChar*, unsigned);
     String16(const char*);
     String16(const char*, size_t);
-    static String16 createUninitialized(unsigned length, UChar*& data);
+    ~String16() { }
+
+    String16 isolatedCopy() const { return String16(m_impl.isolatedCopy()); }
+    const UChar* characters16() const { return m_impl.isEmpty() ? nullptr : m_impl.characters16(); }
+    size_t length() const { return m_impl.length(); }
+    bool isEmpty() const { return m_impl.isEmpty(); }
+    UChar operator[](unsigned index) const { return m_impl[index]; }
+    String16 substring(unsigned pos, unsigned len = UINT_MAX) const { return m_impl.substring(pos, len); }
+    size_t find(const String16& str, unsigned start = 0) const { return m_impl.find(str.impl(), start); }
+    size_t reverseFind(const String16& str, unsigned start = UINT_MAX) const { return m_impl.reverseFind(str.impl(), start); }
 
     // WTF convenience constructors and helper methods.
     String16(const WebString& other) : String16(String(other)) { }
@@ -38,60 +47,11 @@ public:
     operator WTF::StringView() const { return StringView(m_impl); }
     operator WebString() { return m_impl; }
     const WTF::String& impl() const { return m_impl; }
-    String16 isolatedCopy() const { return String16(m_impl.isolatedCopy()); }
-
-    ~String16() { }
-
-    static String16 fromInteger(int i) { return String::number(i); }
-    static String16 fromDouble(double number) { return Decimal::fromDouble(number).toString(); }
-    static String16 fromDoubleFixedPrecision(double number, int precision) { return String::numberToStringFixedWidth(number, precision); }
-
-    size_t length() const { return m_impl.length(); }
-    bool isEmpty() const { return m_impl.isEmpty(); }
-    UChar operator[](unsigned index) const { return m_impl[index]; }
-
-    unsigned sizeInBytes() const { return m_impl.sizeInBytes(); }
-    const UChar* characters16() const { return m_impl.isEmpty() ? nullptr : m_impl.characters16(); }
-
-    static double charactersToDouble(const LChar* characters, size_t length, bool* ok = 0) { return ::charactersToDouble(characters, length, ok); }
-    static double charactersToDouble(const UChar* characters, size_t length, bool* ok = 0) { return ::charactersToDouble(characters, length, ok); }
-
-    String16 substring(unsigned pos, unsigned len = UINT_MAX) const { return m_impl.substring(pos, len); }
-    String16 stripWhiteSpace() const { return m_impl.stripWhiteSpace(); }
-
-    int toInt(bool* ok = 0) const { return m_impl.toInt(ok); }
-
-    size_t find(UChar c, unsigned start = 0) const { return m_impl.find(c, start); }
-    size_t find(const String16& str, unsigned start = 0) const { return m_impl.find(str.impl(), start); }
-    size_t reverseFind(const String16& str, unsigned start = UINT_MAX) const { return m_impl.reverseFind(str.impl(), start); }
-
-    bool startWith(const String16& s) const { return m_impl.startsWith(s); }
-    bool startWith(UChar character) const { return m_impl.startsWith(character); }
-    bool endsWith(const String16& s) const { return m_impl.endsWith(s); }
-    bool endsWith(UChar character) const { return m_impl.endsWith(character); }
 
 private:
     WTF::String m_impl;
 };
 
-class String16Builder {
-public:
-    String16Builder() { }
-    void append(const String16& str) { m_impl.append(str); };
-    void append(UChar c) { m_impl.append(c); };
-    void append(LChar c) { m_impl.append(c); };
-    void append(char c) { m_impl.append(c); };
-    void append(const UChar* c, size_t size) { m_impl.append(c, size); };
-    void append(const char* characters, unsigned length) { m_impl.append(characters, length); }
-    void appendNumber(int number) { m_impl.appendNumber(number); }
-    void appendNumber(double number) { m_impl.appendNumber(number); }
-    String16 toString() { return m_impl.toString(); }
-    void reserveCapacity(unsigned newCapacity) { m_impl.reserveCapacity(newCapacity); }
-
-private:
-    WTF::StringBuilder m_impl;
-};
-
 inline bool operator==(const String16& a, const String16& b) { return a.impl() == b.impl(); }
 inline bool operator!=(const String16& a, const String16& b) { return a.impl() != b.impl(); }
 inline bool operator==(const String16& a, const char* b) { return a.impl() == b; }
@@ -114,14 +74,24 @@ inline String16 operator+(const String16& a, const String16& b)
 } // namespace protocol
 } // namespace blink
 
-using String16 = blink::protocol::String16;
-using String16Builder = blink::protocol::String16Builder;
+namespace std {
+template<> struct hash<blink::protocol::String16> {
+    std::size_t operator()(const blink::protocol::String16& string) const
+    {
+        return StringHash::hash(string.impl());
+    }
+};
+} // namespace std
+
+using InspectorProtocolConvenienceStringType = WTF::String;
+
+// WTF helpers below this line.
 
 namespace WTF {
 
 struct String16Hash {
-    static unsigned hash(const String16& key) { return StringHash::hash(key.impl()); }
-    static bool equal(const String16& a, const String16& b)
+    static unsigned hash(const blink::protocol::String16& key) { return StringHash::hash(key.impl()); }
+    static bool equal(const blink::protocol::String16& a, const blink::protocol::String16& b)
     {
         return StringHash::equal(a.impl(), b.impl());
     }
@@ -129,26 +99,16 @@ struct String16Hash {
 };
 
 template<typename T> struct DefaultHash;
-template<> struct DefaultHash<String16> {
+template<> struct DefaultHash<blink::protocol::String16> {
     typedef String16Hash Hash;
 };
 
 template<>
-struct HashTraits<String16> : SimpleClassHashTraits<String16> {
+struct HashTraits<blink::protocol::String16> : SimpleClassHashTraits<blink::protocol::String16> {
     static const bool hasIsEmptyValueFunction = true;
-    static bool isEmptyValue(const String16& a) { return a.impl().isNull(); }
+    static bool isEmptyValue(const blink::protocol::String16& a) { return a.impl().isNull(); }
 };
 
 } // namespace WTF
 
-namespace std {
-template<> struct hash<String16> {
-    std::size_t operator()(const String16& string) const
-    {
-        return StringHash::hash(string.impl());
-    }
-};
-
-} // namespace std
-
 #endif // !defined(String16WTF_h)