Remove WebCString from Blink

Now that it is no longer in use, This change removes the implementation of
WebCString, and cleans up the few dangling \#includes and comments which still
referenced it.

Bug: 568803
Change-Id: I19717da309c7ee885542e1c688a6383a12fe9081
Reviewed-on: https://chromium-review.googlesource.com/594673Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Ian Clelland <iclelland@chromium.org>
Cr-Commit-Position: refs/heads/master@{#491238}

content/public/common/context_menu_params.h

@@ -16,7 +16,6 @@
 #include "content/common/content_export.h"
 #include "content/public/common/menu_item.h"
 #include "content/public/common/page_state.h"
-#include "third_party/WebKit/public/platform/WebCString.h"
 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
 #include "third_party/WebKit/public/web/WebContextMenuData.h"
 #include "ui/base/ui_base_types.h"

third_party/WebKit/Source/modules/peerconnection/RTCStatsReport.h

@@ -9,7 +9,6 @@
 #include "platform/bindings/ScriptWrappable.h"
 #include "platform/heap/GarbageCollected.h"
 #include "platform/wtf/text/WTFString.h"
-#include "public/platform/WebCString.h"
 #include "public/platform/WebRTCStats.h"
 
 #include <map>

third_party/WebKit/Source/platform/BUILD.gn

@@ -565,7 +565,6 @@ component("platform") {
     "exported/WebAudioBus.cpp",
     "exported/WebAudioDevice.cpp",
     "exported/WebBlobData.cpp",
-    "exported/WebCString.cpp",
     "exported/WebCache.cpp",
     "exported/WebCanvasCaptureHandler.cpp",
     "exported/WebCoalescedInputEvent.cpp",

third_party/WebKit/Source/platform/exported/WebCString.cpp

-/*
- * Copyright (C) 2009 Google Inc. All rights reserved.
- * Copyright (C) 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:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "public/platform/WebCString.h"
-
-#include <string.h>
-#include "platform/wtf/text/CString.h"
-#include "public/platform/WebString.h"
-
-namespace blink {
-
-int WebCString::Compare(const WebCString& other) const {
-  // A null string is always less than a non null one.
-  if (IsNull() != other.IsNull())
-    return IsNull() ? -1 : 1;
-
-  if (IsNull())
-    return 0;  // Both WebStrings are null.
-
-  return strcmp(private_->data(), other.private_->data());
-}
-
-void WebCString::Reset() {
-  private_.Reset();
-}
-
-void WebCString::Assign(const WebCString& other) {
-  Assign(other.private_.Get());
-}
-
-void WebCString::Assign(const char* data, size_t length) {
-  Assign(WTF::CString(data, length).Impl());
-}
-
-size_t WebCString::length() const {
-  return private_.IsNull() ? 0 : private_->length();
-}
-
-const char* WebCString::Data() const {
-  return private_.IsNull() ? 0 : private_->data();
-}
-
-WebString WebCString::Utf16() const {
-  return WebString::FromUTF8(Data(), length());
-}
-
-WebCString::WebCString(const WTF::CString& s) {
-  Assign(s.Impl());
-}
-
-WebCString& WebCString::operator=(const WTF::CString& s) {
-  Assign(s.Impl());
-  return *this;
-}
-
-WebCString::operator WTF::CString() const {
-  return private_.Get();
-}
-
-void WebCString::Assign(WTF::CStringImpl* p) {
-  private_ = p;
-}
-
-}  // namespace blink

third_party/WebKit/public/BUILD.gn

@@ -133,7 +133,6 @@ source_set("blink_headers") {
     "platform/WebBlobInfo.h",
     "platform/WebBlobRegistry.h",
     "platform/WebBrowserControlsState.h",
-    "platform/WebCString.h",
     "platform/WebCache.h",
     "platform/WebCachePolicy.h",
     "platform/WebCallbacks.h",

third_party/WebKit/public/platform/WebCString.h

-/*
- * Copyright (C) 2009 Google 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:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebCString_h
-#define WebCString_h
-
-#include "WebCommon.h"
-#include "WebPrivatePtr.h"
-
-#if INSIDE_BLINK
-#include "platform/wtf/Forward.h"
-#endif
-#if !INSIDE_BLINK || defined(UNIT_TEST)
-#include <string>
-#endif
-
-namespace WTF {
-class CString;
-class CStringImpl;
-}
-
-namespace blink {
-
-class WebString;
-
-// A single-byte string container with unspecified encoding.  It is
-// inexpensive to copy a WebCString object.
-//
-// WARNING: It is not safe to pass a WebCString across threads!!!
-//
-class WebCString {
- public:
-  ~WebCString() { Reset(); }
-
-  WebCString() {}
-
-  WebCString(const char* data, size_t len) { Assign(data, len); }
-
-  WebCString(const WebCString& s) { Assign(s); }
-
-  WebCString& operator=(const WebCString& s) {
-    Assign(s);
-    return *this;
-  }
-
-  // Returns 0 if both strings are equals, a value greater than zero if the
-  // first character that does not match has a greater value in this string
-  // than in |other|, or a value less than zero to indicate the opposite.
-  BLINK_PLATFORM_EXPORT int Compare(const WebCString& other) const;
-
-  BLINK_PLATFORM_EXPORT void Reset();
-  BLINK_PLATFORM_EXPORT void Assign(const WebCString&);
-  BLINK_PLATFORM_EXPORT void Assign(const char* data, size_t len);
-
-  BLINK_PLATFORM_EXPORT size_t length() const;
-  BLINK_PLATFORM_EXPORT const char* Data() const;
-
-  bool IsEmpty() const { return !length(); }
-  bool IsNull() const { return private_.IsNull(); }
-
-  BLINK_PLATFORM_EXPORT WebString Utf16() const;
-
-#if INSIDE_BLINK
-  BLINK_PLATFORM_EXPORT WebCString(const WTF::CString&);
-  BLINK_PLATFORM_EXPORT WebCString& operator=(const WTF::CString&);
-  BLINK_PLATFORM_EXPORT operator WTF::CString() const;
-#else
-  WebCString(const std::string& s) { Assign(s.data(), s.length()); }
-
-  WebCString& operator=(const std::string& s) {
-    Assign(s.data(), s.length());
-    return *this;
-  }
-#endif
-#if !INSIDE_BLINK || defined(UNIT_TEST)
-  operator std::string() const {
-    size_t len = length();
-    return len ? std::string(Data(), len) : std::string();
-  }
-
-  template <class UTF16String>
-  static WebCString FromUTF16(const UTF16String& s) {
-    return FromUTF16(s.Data(), s.length());
-  }
-#endif
-
- private:
-  BLINK_PLATFORM_EXPORT void Assign(WTF::CStringImpl*);
-  WebPrivatePtr<WTF::CStringImpl> private_;
-};
-
-inline bool operator<(const WebCString& a, const WebCString& b) {
-  return a.Compare(b) < 0;
-}
-
-}  // namespace blink
-
-#endif

third_party/WebKit/public/platform/WebURLResponse.h

@@ -35,7 +35,6 @@
 
 #include "base/time/time.h"
 #include "net/http/http_response_info.h"
-#include "public/platform/WebCString.h"
 #include "public/platform/WebCommon.h"
 #include "public/platform/WebSecurityStyle.h"
 #include "public/platform/WebString.h"

third_party/WebKit/public/platform/WebVector.h

@@ -54,9 +54,9 @@ namespace blink {
 // It is also possible to assign from any container that implements begin()
 // and end().
 //
-//   void Foo(const std::vector<std::string>& input)
+//   void Foo(const std::vector<WTF::String>& input)
 //   {
-//       WebVector<WebCString> cstrings = input;
+//       WebVector<WebString> strings = input;
 //       ...
 //   }
 //