From 79768700a853c40c66ff0b0591957958667fdd9e Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Wed, 28 Apr 2010 15:26:38 +0100
Subject: Merge webkit.org at r58033 : Update location of CString.h

See http://trac.webkit.org/changeset/56825

Change-Id: I8ba6a9685dcd1d8c4dec3400fba81e19fcbfe74d
---
 WebKit/android/plugins/ANPSystemInterface.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'WebKit/android/plugins/ANPSystemInterface.cpp')

diff --git a/WebKit/android/plugins/ANPSystemInterface.cpp b/WebKit/android/plugins/ANPSystemInterface.cpp
index 42ec9e4..34fe162 100644
--- a/WebKit/android/plugins/ANPSystemInterface.cpp
+++ b/WebKit/android/plugins/ANPSystemInterface.cpp
@@ -26,7 +26,7 @@
 // must include config.h first for webkit to fiddle with new/delete
 #include "config.h"
 
-#include "CString.h"
+#include "ANPSystem_npapi.h"
 #include "JavaSharedClient.h"
 #include "PluginClient.h"
 #include "PluginPackage.h"
@@ -34,8 +34,7 @@
 #include "PluginWidgetAndroid.h"
 #include "SkString.h"
 #include "WebViewCore.h"
-
-#include "ANPSystem_npapi.h"
+#include <wtf/text/CString.h>
 
 static const char* gApplicationDataDir = NULL;
 
-- 
cgit v1.1