Remove lots of usage of WebCString.

BUG=585665
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
TBR=dalecurtis@chromium.org,jochen@chromium.org

Review URL: https://codereview.chromium.org/1807193004

Cr-Commit-Position: refs/heads/master@{#382064}

31 files changed, 18 insertions, 56 deletions

diff --git a/cc/blink/web_layer_impl.h b/cc/blink/web_layer_impl.h
index c4e8e27..14d49ab 100644
--- a/cc/blink/web_layer_impl.h
+++ b/cc/blink/web_layer_impl.h
@@ -16,7 +16,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "cc/blink/cc_blink_export.h"
 #include "cc/layers/layer_client.h"
-#include "third_party/WebKit/public/platform/WebCString.h"
 #include "third_party/WebKit/public/platform/WebColor.h"
 #include "third_party/WebKit/public/platform/WebDoublePoint.h"
 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
diff --git a/chrome/renderer/tts_dispatcher.cc b/chrome/renderer/tts_dispatcher.cc
index 9b00a6e..52c87ef 100644
--- a/chrome/renderer/tts_dispatcher.cc
+++ b/chrome/renderer/tts_dispatcher.cc
@@ -10,7 +10,6 @@
 #include "chrome/common/tts_messages.h"
 #include "chrome/common/tts_utterance_request.h"
 #include "content/public/renderer/render_thread.h"
-#include "third_party/WebKit/public/platform/WebCString.h"
 #include "third_party/WebKit/public/platform/WebSpeechSynthesisUtterance.h"
 #include "third_party/WebKit/public/platform/WebSpeechSynthesisVoice.h"
 #include "third_party/WebKit/public/platform/WebString.h"
diff --git a/components/test_runner/mock_grammar_check.cc b/components/test_runner/mock_grammar_check.cc
index b172dfa..9125766 100644
--- a/components/test_runner/mock_grammar_check.cc
+++ b/components/test_runner/mock_grammar_check.cc
@@ -11,7 +11,6 @@
 #include "base/logging.h"
 #include "base/macros.h"
 #include "components/test_runner/test_common.h"
-#include "third_party/WebKit/public/platform/WebCString.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/web/WebTextCheckingResult.h"
 
diff --git a/components/test_runner/mock_spell_check.cc b/components/test_runner/mock_spell_check.cc
index 3f427f6..10343cc 100644
--- a/components/test_runner/mock_spell_check.cc
+++ b/components/test_runner/mock_spell_check.cc
@@ -11,7 +11,6 @@
 #include "base/logging.h"
 #include "base/macros.h"
 #include "components/test_runner/test_common.h"
-#include "third_party/WebKit/public/platform/WebCString.h"
 
 namespace test_runner {
 
diff --git a/components/test_runner/web_content_settings.cc b/components/test_runner/web_content_settings.cc
index c0aa316..233363b 100644
--- a/components/test_runner/web_content_settings.cc
+++ b/components/test_runner/web_content_settings.cc
@@ -6,7 +6,6 @@
 
 #include "components/test_runner/test_common.h"
 #include "components/test_runner/web_test_delegate.h"
-#include "third_party/WebKit/public/platform/WebCString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 
 namespace test_runner {
diff --git a/components/test_runner/web_test_proxy.cc b/components/test_runner/web_test_proxy.cc
index 0f181e5..7e76f1f7b 100644
--- a/components/test_runner/web_test_proxy.cc
+++ b/components/test_runner/web_test_proxy.cc
@@ -37,7 +37,6 @@
 // FIXME: Including platform_canvas.h here is a layering violation.
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/public/platform/Platform.h"
-#include "third_party/WebKit/public/platform/WebCString.h"
 #include "third_party/WebKit/public/platform/WebClipboard.h"
 #include "third_party/WebKit/public/platform/WebCompositeAndReadbackAsyncCallback.h"
 #include "third_party/WebKit/public/platform/WebLayoutAndPaintAsyncCallback.h"
@@ -986,16 +985,14 @@ void WebTestProxyBase::DidCommitProvisionalLoad(
 void WebTestProxyBase::DidReceiveTitle(blink::WebLocalFrame* frame,
                                        const blink::WebString& title,
                                        blink::WebTextDirection direction) {
-  blink::WebCString title8 = title.utf8();
-
   if (test_interfaces_->GetTestRunner()->shouldDumpFrameLoadCallbacks()) {
     PrintFrameDescription(delegate_, frame);
-    delegate_->PrintMessage(std::string(" - didReceiveTitle: ") +
-                            title8.data() + "\n");
+    delegate_->PrintMessage(std::string(" - didReceiveTitle: ") + title.utf8() +
+                            "\n");
   }
 
   if (test_interfaces_->GetTestRunner()->shouldDumpTitleChanges())
-    delegate_->PrintMessage(std::string("TITLE CHANGED: '") + title8.data() +
+    delegate_->PrintMessage(std::string("TITLE CHANGED: '") + title.utf8() +
                             "'\n");
 }
 
diff --git a/content/browser/renderer_host/sandbox_ipc_linux.cc b/content/browser/renderer_host/sandbox_ipc_linux.cc
index bbea7e9..8088598 100644
--- a/content/browser/renderer_host/sandbox_ipc_linux.cc
+++ b/content/browser/renderer_host/sandbox_ipc_linux.cc
@@ -34,7 +34,6 @@
 #include "ui/gfx/font.h"
 #include "ui/gfx/font_render_params.h"
 
-using blink::WebCString;
 using blink::WebFontInfo;
 using blink::WebUChar;
 using blink::WebUChar32;
diff --git a/content/child/indexed_db/webidbfactory_impl.cc b/content/child/indexed_db/webidbfactory_impl.cc
index a296660..fcb6312 100644
--- a/content/child/indexed_db/webidbfactory_impl.cc
+++ b/content/child/indexed_db/webidbfactory_impl.cc
@@ -7,7 +7,6 @@
 #include "content/child/indexed_db/indexed_db_dispatcher.h"
 #include "content/child/thread_safe_sender.h"
 #include "third_party/WebKit/public/platform/URLConversion.h"
-#include "third_party/WebKit/public/platform/WebCString.h"
 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 
diff --git a/content/child/shared_worker_devtools_agent.cc b/content/child/shared_worker_devtools_agent.cc
index 5ec3921..b0698f3 100644
--- a/content/child/shared_worker_devtools_agent.cc
+++ b/content/child/shared_worker_devtools_agent.cc
@@ -9,7 +9,6 @@
 #include "content/child/child_thread_impl.h"
 #include "content/common/devtools_messages.h"
 #include "ipc/ipc_channel.h"
-#include "third_party/WebKit/public/platform/WebCString.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/web/WebSharedWorker.h"
 
diff --git a/content/child/web_database_observer_impl.cc b/content/child/web_database_observer_impl.cc
index 8209f88..c0b1038 100644
--- a/content/child/web_database_observer_impl.cc
+++ b/content/child/web_database_observer_impl.cc
@@ -10,7 +10,6 @@
 #include "base/strings/string16.h"
 #include "base/thread_task_runner_handle.h"
 #include "content/common/database_messages.h"
-#include "third_party/WebKit/public/platform/WebCString.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/sqlite/sqlite3.h"
 
diff --git a/content/public/common/context_menu_params.h b/content/public/common/context_menu_params.h
index 3bf6fce0..7269f1b 100644
--- a/content/public/common/context_menu_params.h
+++ b/content/public/common/context_menu_params.h
@@ -17,6 +17,7 @@
 #include "content/public/common/menu_item.h"
 #include "content/public/common/page_state.h"
 #include "content/public/common/ssl_status.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"
diff --git a/content/renderer/npapi/webplugin_impl.cc b/content/renderer/npapi/webplugin_impl.cc
index 5219283..f9d6a23 100644
--- a/content/renderer/npapi/webplugin_impl.cc
+++ b/content/renderer/npapi/webplugin_impl.cc
@@ -37,7 +37,6 @@
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
 #include "skia/ext/platform_canvas.h"
-#include "third_party/WebKit/public/platform/WebCString.h"
 #include "third_party/WebKit/public/platform/WebCookieJar.h"
 #include "third_party/WebKit/public/platform/WebCursorInfo.h"
 #include "third_party/WebKit/public/platform/WebData.h"
@@ -60,7 +59,6 @@
 #include "url/gurl.h"
 #include "url/url_util.h"
 
-using blink::WebCString;
 using blink::WebCanvas;
 using blink::WebConsoleMessage;
 using blink::WebCookieJar;
diff --git a/content/renderer/npapi/webplugin_impl_unittest.cc b/content/renderer/npapi/webplugin_impl_unittest.cc
index 2cec6b8..5137b05 100644
--- a/content/renderer/npapi/webplugin_impl_unittest.cc
+++ b/content/renderer/npapi/webplugin_impl_unittest.cc
@@ -8,7 +8,6 @@
 #include "base/strings/string_util.h"
 #include "content/renderer/npapi/webplugin_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/public/platform/WebCString.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 
diff --git a/content/renderer/pepper/pepper_file_chooser_host.cc b/content/renderer/pepper/pepper_file_chooser_host.cc
index ea10768..572b0cd 100644
--- a/content/renderer/pepper/pepper_file_chooser_host.cc
+++ b/content/renderer/pepper/pepper_file_chooser_host.cc
@@ -16,7 +16,6 @@
 #include "ppapi/host/dispatch_host_message.h"
 #include "ppapi/host/ppapi_host.h"
 #include "ppapi/proxy/ppapi_messages.h"
-#include "third_party/WebKit/public/platform/WebCString.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/public/web/WebFileChooserCompletion.h"
diff --git a/content/renderer/pepper/pepper_url_request_unittest.cc b/content/renderer/pepper/pepper_url_request_unittest.cc
index 8c374d5f..35f12c1 100644
--- a/content/renderer/pepper/pepper_url_request_unittest.cc
+++ b/content/renderer/pepper/pepper_url_request_unittest.cc
@@ -23,7 +23,6 @@
 // test it by making sure the conversion routines actually work at the same
 // time.
 
-using blink::WebCString;
 using blink::WebFrameClient;
 using blink::WebString;
 using blink::WebView;
@@ -32,15 +31,6 @@ using blink::WebURLRequest;
 
 namespace {
 
-bool IsExpected(const WebCString& web_string, const char* expected) {
-  const char* result = web_string.data();
-  return strcmp(result, expected) == 0;
-}
-
-bool IsExpected(const WebString& web_string, const char* expected) {
-  return IsExpected(web_string.utf8(), expected);
-}
-
 // The base class destructor is protected, so derive.
 class TestWebFrameClient : public WebFrameClient {};
 
@@ -79,12 +69,12 @@ class URLRequestInfoTest : public RenderViewTest {
     return web_request.downloadToFile();
   }
 
-  std::string GetURL() {
+  WebString GetURL() {
     WebURLRequest web_request;
     URLRequestInfoData data = info_->GetData();
     if (!CreateWebURLRequest(pp_instance_, &data, GetMainFrame(), &web_request))
-      return WebCString();
-    return web_request.url().string().utf8();
+      return WebString();
+    return web_request.url().string();
   }
 
   WebString GetMethod() {
@@ -208,7 +198,7 @@ TEST_F(URLRequestInfoTest, AllowCredentials) {
 TEST_F(URLRequestInfoTest, SetURL) {
   const char* url = "http://www.google.com/";
   EXPECT_TRUE(SetStringProperty(PP_URLREQUESTPROPERTY_URL, url));
-  EXPECT_TRUE(IsExpected(GetURL(), url));
+  EXPECT_STREQ(url, GetURL().utf8().data());
 }
 
 TEST_F(URLRequestInfoTest, JavascriptURL) {
@@ -220,22 +210,22 @@ TEST_F(URLRequestInfoTest, JavascriptURL) {
 
 TEST_F(URLRequestInfoTest, SetMethod) {
   // Test default method is "GET".
-  EXPECT_TRUE(IsExpected(GetMethod(), "GET"));
+  EXPECT_STREQ("GET", GetMethod().utf8().data());
   EXPECT_TRUE(SetStringProperty(PP_URLREQUESTPROPERTY_METHOD, "POST"));
-  EXPECT_TRUE(IsExpected(GetMethod(), "POST"));
+  EXPECT_STREQ("POST", GetMethod().utf8().data());
 }
 
 TEST_F(URLRequestInfoTest, SetHeaders) {
   // Test default header field.
-  EXPECT_TRUE(IsExpected(GetHeaderValue("foo"), ""));
+  EXPECT_STREQ("", GetHeaderValue("foo").utf8().data());
   // Test that we can set a header field.
   EXPECT_TRUE(SetStringProperty(PP_URLREQUESTPROPERTY_HEADERS, "foo: bar"));
-  EXPECT_TRUE(IsExpected(GetHeaderValue("foo"), "bar"));
+  EXPECT_STREQ("bar", GetHeaderValue("foo").utf8().data());
   // Test that we can set multiple header fields using \n delimiter.
   EXPECT_TRUE(
       SetStringProperty(PP_URLREQUESTPROPERTY_HEADERS, "foo: bar\nbar: baz"));
-  EXPECT_TRUE(IsExpected(GetHeaderValue("foo"), "bar"));
-  EXPECT_TRUE(IsExpected(GetHeaderValue("bar"), "baz"));
+  EXPECT_STREQ("bar", GetHeaderValue("foo").utf8().data());
+  EXPECT_STREQ("baz", GetHeaderValue("bar").utf8().data());
 }
 
 // TODO(bbudge) Unit tests for AppendDataToBody, AppendFileToBody.
diff --git a/content/renderer/pepper/url_response_info_util.cc b/content/renderer/pepper/url_response_info_util.cc
index 723e657..12d05e5 100644
--- a/content/renderer/pepper/url_response_info_util.cc
+++ b/content/renderer/pepper/url_response_info_util.cc
@@ -18,7 +18,6 @@
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/shared_impl/url_response_info_data.h"
 #include "third_party/WebKit/public/platform/FilePathConversion.h"
-#include "third_party/WebKit/public/platform/WebCString.h"
 #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index edddc05..a2247e7 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -115,7 +115,6 @@
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/public/platform/FilePathConversion.h"
 #include "third_party/WebKit/public/platform/URLConversion.h"
-#include "third_party/WebKit/public/platform/WebCString.h"
 #include "third_party/WebKit/public/platform/WebConnectionType.h"
 #include "third_party/WebKit/public/platform/WebDragData.h"
 #include "third_party/WebKit/public/platform/WebHTTPBody.h"
@@ -212,7 +211,6 @@
 using blink::WebAXObject;
 using blink::WebApplicationCacheHost;
 using blink::WebApplicationCacheHostClient;
-using blink::WebCString;
 using blink::WebColor;
 using blink::WebConsoleMessage;
 using blink::WebData;
diff --git a/content/renderer/service_worker/embedded_worker_devtools_agent.cc b/content/renderer/service_worker/embedded_worker_devtools_agent.cc
index a099729..6d44d5f 100644
--- a/content/renderer/service_worker/embedded_worker_devtools_agent.cc
+++ b/content/renderer/service_worker/embedded_worker_devtools_agent.cc
@@ -6,7 +6,6 @@
 
 #include "content/common/devtools_messages.h"
 #include "content/renderer/render_thread_impl.h"
-#include "third_party/WebKit/public/platform/WebCString.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/web/WebEmbeddedWorker.h"
 
diff --git a/content/shell/renderer/layout_test/blink_test_runner.cc b/content/shell/renderer/layout_test/blink_test_runner.cc
index 149818f..76f1fcc 100644
--- a/content/shell/renderer/layout_test/blink_test_runner.cc
+++ b/content/shell/renderer/layout_test/blink_test_runner.cc
@@ -56,7 +56,6 @@
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/public/platform/FilePathConversion.h"
 #include "third_party/WebKit/public/platform/Platform.h"
-#include "third_party/WebKit/public/platform/WebCString.h"
 #include "third_party/WebKit/public/platform/WebPoint.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
diff --git a/extensions/renderer/blob_native_handler.cc b/extensions/renderer/blob_native_handler.cc
index 12068c3..4161fbc 100644
--- a/extensions/renderer/blob_native_handler.cc
+++ b/extensions/renderer/blob_native_handler.cc
@@ -6,7 +6,6 @@
 
 #include "base/bind.h"
 #include "extensions/renderer/script_context.h"
-#include "third_party/WebKit/public/platform/WebCString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/web/WebBlob.h"
 
diff --git a/media/blink/cache_util.cc b/media/blink/cache_util.cc
index 4d0a44c..5b16450 100644
--- a/media/blink/cache_util.cc
+++ b/media/blink/cache_util.cc
@@ -14,7 +14,6 @@
 #include "base/time/time.h"
 #include "net/http/http_util.h"
 #include "net/http/http_version.h"
-#include "third_party/WebKit/public/platform/WebCString.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 
diff --git a/media/blink/webmediasource_impl.cc b/media/blink/webmediasource_impl.cc
index cf53e6b..7aed8db 100644
--- a/media/blink/webmediasource_impl.cc
+++ b/media/blink/webmediasource_impl.cc
@@ -8,7 +8,6 @@
 #include "media/base/mime_util.h"
 #include "media/blink/websourcebuffer_impl.h"
 #include "media/filters/chunk_demuxer.h"
-#include "third_party/WebKit/public/platform/WebCString.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 
 using ::blink::WebString;
diff --git a/third_party/WebKit/Source/platform/exported/WebString.cpp b/third_party/WebKit/Source/platform/exported/WebString.cpp
index 6371178..26b8415 100644
--- a/third_party/WebKit/Source/platform/exported/WebString.cpp
+++ b/third_party/WebKit/Source/platform/exported/WebString.cpp
@@ -30,7 +30,6 @@
 
 #include "public/platform/WebString.h"
 
-#include "public/platform/WebCString.h"
 #include "wtf/text/AtomicString.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/StringUTF8Adaptor.h"
@@ -99,7 +98,7 @@ std::string WebString::latin1() const
     if (string.is8Bit())
         return std::string(reinterpret_cast<const char*>(string.characters8()), string.length());
 
-    WebCString latin1 = string.latin1();
+    CString latin1 = string.latin1();
     return std::string(latin1.data(), latin1.length());
 }
 
diff --git a/third_party/WebKit/Source/web/WebFrameSerializer.cpp b/third_party/WebKit/Source/web/WebFrameSerializer.cpp
index 379fef8..2c8a1e6 100644
--- a/third_party/WebKit/Source/web/WebFrameSerializer.cpp
+++ b/third_party/WebKit/Source/web/WebFrameSerializer.cpp
@@ -48,7 +48,6 @@
 #include "platform/mhtml/MHTMLArchive.h"
 #include "platform/mhtml/MHTMLParser.h"
 #include "platform/weborigin/KURL.h"
-#include "public/platform/WebCString.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/WebVector.h"
diff --git a/third_party/WebKit/Source/web/WebFrameSerializerImpl.cpp b/third_party/WebKit/Source/web/WebFrameSerializerImpl.cpp
index 22b7024..ee95063 100644
--- a/third_party/WebKit/Source/web/WebFrameSerializerImpl.cpp
+++ b/third_party/WebKit/Source/web/WebFrameSerializerImpl.cpp
@@ -92,6 +92,7 @@
 #include "core/html/HTMLMetaElement.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/loader/FrameLoader.h"
+#include "public/platform/WebCString.h"
 #include "public/platform/WebVector.h"
 #include "web/WebLocalFrameImpl.h"
 #include "wtf/text/TextEncoding.h"
diff --git a/third_party/WebKit/Source/web/tests/WebFrameSerializerTest.cpp b/third_party/WebKit/Source/web/tests/WebFrameSerializerTest.cpp
index edb3962..85f9a1f 100644
--- a/third_party/WebKit/Source/web/tests/WebFrameSerializerTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebFrameSerializerTest.cpp
@@ -33,6 +33,7 @@
 #include "platform/testing/URLTestHelpers.h"
 #include "platform/weborigin/KURL.h"
 #include "public/platform/Platform.h"
+#include "public/platform/WebCString.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/WebUnitTestSupport.h"
diff --git a/third_party/WebKit/public/platform/WebURL.h b/third_party/WebKit/public/platform/WebURL.h
index 6692f0a..f0f688b8 100644
--- a/third_party/WebKit/public/platform/WebURL.h
+++ b/third_party/WebKit/public/platform/WebURL.h
@@ -31,7 +31,6 @@
 #ifndef WebURL_h
 #define WebURL_h
 
-#include "WebCString.h"
 #include "WebString.h"
 #include "url/third_party/mozilla/url_parse.h"
 
diff --git a/third_party/WebKit/public/platform/WebURLResponse.h b/third_party/WebKit/public/platform/WebURLResponse.h
index 1b507d9..8314b45 100644
--- a/third_party/WebKit/public/platform/WebURLResponse.h
+++ b/third_party/WebKit/public/platform/WebURLResponse.h
@@ -31,6 +31,7 @@
 #ifndef WebURLResponse_h
 #define WebURLResponse_h
 
+#include "public/platform/WebCString.h"
 #include "public/platform/WebCommon.h"
 #include "public/platform/WebPrivateOwnPtr.h"
 #include "public/platform/WebString.h"
@@ -39,10 +40,8 @@
 namespace blink {
 
 class ResourceResponse;
-class WebCString;
 class WebHTTPHeaderVisitor;
 class WebHTTPLoadInfo;
-class WebString;
 class WebURL;
 class WebURLLoadTiming;
 class WebURLResponsePrivate;
diff --git a/third_party/WebKit/public/platform/linux/WebFontInfo.h b/third_party/WebKit/public/platform/linux/WebFontInfo.h
index 839a71a..bfd7372 100644
--- a/third_party/WebKit/public/platform/linux/WebFontInfo.h
+++ b/third_party/WebKit/public/platform/linux/WebFontInfo.h
@@ -31,7 +31,6 @@
 #ifndef WebFontInfo_h
 #define WebFontInfo_h
 
-#include "../WebCString.h"
 #include "WebFallbackFont.h"
 
 #include <string.h>
diff --git a/third_party/WebKit/public/web/WebDevToolsAgentClient.h b/third_party/WebKit/public/web/WebDevToolsAgentClient.h
index 5f34857..61f450c 100644
--- a/third_party/WebKit/public/web/WebDevToolsAgentClient.h
+++ b/third_party/WebKit/public/web/WebDevToolsAgentClient.h
@@ -31,7 +31,6 @@
 #ifndef WebDevToolsAgentClient_h
 #define WebDevToolsAgentClient_h
 
-#include "../platform/WebCString.h"
 #include "../platform/WebCommon.h"
 #include "../platform/WebString.h"
 
diff --git a/third_party/WebKit/public/web/WebFrameSerializer.h b/third_party/WebKit/public/web/WebFrameSerializer.h
index 3bba668..ecf4acf 100644
--- a/third_party/WebKit/public/web/WebFrameSerializer.h
+++ b/third_party/WebKit/public/web/WebFrameSerializer.h
@@ -31,7 +31,6 @@
 #ifndef WebFrameSerializer_h
 #define WebFrameSerializer_h
 
-#include "../platform/WebCString.h"
 #include "../platform/WebCommon.h"
 #include "../platform/WebData.h"
 #include "../platform/WebString.h"