Fix up naming in CString.

third_party/WebKit/Source/wtf/text/CString.h

 /*
  * Copyright (C) 2003, 2006, 2008, 2009, 2010, 2012 Apple Inc. All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 17 matching lines @@
 #define CString_h
 
 #include "wtf/Allocator.h"
 #include "wtf/RefCounted.h"
 #include "wtf/RefPtr.h"
 #include "wtf/WTFExport.h"
 #include <string.h>
 
 namespace WTF {
 
-// CStringBuffer is an immutable ref-counted storage for the characters in a
+// CStringImpl is an immutable ref-counted storage for the characters in a
 // CString. It's analogous to a StringImpl but may contain any arbitrary
 // sequence of bytes. The data is always allocated 1 longer than length() and is
 // null terminated.
-// TODO(esprehn): Rename to CStringImpl.
-class WTF_EXPORT CStringBuffer : public RefCounted<CStringBuffer> {
-  WTF_MAKE_NONCOPYABLE(CStringBuffer);
+class WTF_EXPORT CStringImpl : public RefCounted<CStringImpl> {
+  WTF_MAKE_NONCOPYABLE(CStringImpl);
 
  public:
-  // CStringBuffers are allocated out of the WTF buffer partition.
+  // CStringImpls are allocated out of the WTF buffer partition.
   void* operator new(size_t, void* ptr) { return ptr; }
   void operator delete(void*);
 
-  static PassRefPtr<CStringBuffer> createUninitialized(size_t length,
-                                                       char*& data);
+  static PassRefPtr<CStringImpl> createUninitialized(size_t length,
+                                                     char*& data);
 
   const char* data() const { return reinterpret_cast<const char*>(this + 1); }
   size_t length() const { return m_length; }
 
  private:
-  explicit CStringBuffer(size_t length) : m_length(length) {}
+  explicit CStringImpl(size_t length) : m_length(length) {}
 
   const unsigned m_length;
 };
 
 // A container for an immutable ref-counted null-terminated char array. This is
 // analogous to a WTF::String but does not require the contained bytes to be
 // valid Latin1 or UTF-16. Instead a CString can contain any arbitrary bytes.
 class WTF_EXPORT CString {
   USING_FAST_MALLOC(CString);
 
  public:
   // Construct a null string, distinguishable from an empty string.
   CString() {}
 
   // Construct a string from arbitrary bytes.
   CString(const char* chars) : CString(chars, chars ? strlen(chars) : 0) {}
   CString(const char*, size_t length);
 
   // Construct a string referencing an existing buffer.
-  CString(CStringBuffer* buffer) : m_buffer(buffer) {}
-  CString(PassRefPtr<CStringBuffer> buffer) : m_buffer(buffer) {}
+  CString(CStringImpl* buffer) : m_buffer(buffer) {}
+  CString(PassRefPtr<CStringImpl> buffer) : m_buffer(buffer) {}
 
-  // TODO(esprehn): Rename to createUninitialized.
-  static CString newUninitialized(size_t length, char*& data) {
-    return CStringBuffer::createUninitialized(length, data);
+  static CString createUninitialized(size_t length, char*& data) {
+    return CStringImpl::createUninitialized(length, data);
   }
 
   // The bytes of the string, always NUL terminated. May be null.
   const char* data() const { return m_buffer ? m_buffer->data() : 0; }
 
   // The length of the data(), *not* including the NUL terminator.
   size_t length() const { return m_buffer ? m_buffer->length() : 0; }
 
   bool isNull() const { return !m_buffer; }
 
   bool isSafeToSendToAnotherThread() const;
 
-  // TODO(esprehn): Rename to impl() when CStringBuffer is renamed.
-  CStringBuffer* buffer() const { return m_buffer.get(); }
+  CStringImpl* impl() const { return m_buffer.get(); }
 
  private:
-  RefPtr<CStringBuffer> m_buffer;
+  RefPtr<CStringImpl> m_buffer;
 };
 
 WTF_EXPORT bool operator==(const CString& a, const CString& b);
 inline bool operator!=(const CString& a, const CString& b) {
   return !(a == b);
 }
 WTF_EXPORT bool operator==(const CString& a, const char* b);
 inline bool operator!=(const CString& a, const char* b) {
   return !(a == b);
 }
 
 // Pretty printer for gtest and base/logging.*.  It prepends and appends
 // double-quotes, and escapes characters other than ASCII printables.
 WTF_EXPORT std::ostream& operator<<(std::ostream&, const CString&);
 
 }  // namespace WTF
 
 using WTF::CString;
 
 #endif  // CString_h