Merge change I6d6312e9 into eclair-mr2

* changes:
  Fixes WTF include in WebCore/page/Geolocation.cpp to fix Mac build.

4 files changed, 7 insertions, 7 deletions

diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
index 5ed785a..3129d1f 100644
--- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
+++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
@@ -29,8 +29,8 @@
 #include "ChromeClient.h"
 
 #include "GeolocationPermissions.h"
-#include "Threading.h"
 #include "Timer.h"
+#include <wtf/Threading.h>
 
 namespace WebCore {
     class Geolocation;
diff --git a/WebKit/android/WebCoreSupport/GeolocationPermissions.h b/WebKit/android/WebCoreSupport/GeolocationPermissions.h
index 59e8ce1..33434b9 100755
--- a/WebKit/android/WebCoreSupport/GeolocationPermissions.h
+++ b/WebKit/android/WebCoreSupport/GeolocationPermissions.h
@@ -30,11 +30,11 @@
 // We must include this before before HashMap.h, as it provides specalizations
 // for String hash types instantiated there.
 #include "StringHash.h"
-#include "HashMap.h"
-#include "HashSet.h"
 #include "Timer.h"
-#include "Vector.h"
-#include "wtf/RefCounted.h"
+#include <wtf/HashMap.h>
+#include <wtf/HashSet.h>
+#include <wtf/RefCounted.h>
+#include <wtf/Vector.h>
 
 namespace WebCore {
     class Frame;
diff --git a/WebKit/android/benchmark/Intercept.cpp b/WebKit/android/benchmark/Intercept.cpp
index c31fe5e..90cf1e1 100644
--- a/WebKit/android/benchmark/Intercept.cpp
+++ b/WebKit/android/benchmark/Intercept.cpp
@@ -28,7 +28,6 @@
 
 #include "Base64.h"
 #include "CString.h"
-#include "HashMap.h"
 #include "HTTPParsers.h"
 #include "Intercept.h"
 #include "ResourceHandle.h"
@@ -38,6 +37,7 @@
 #include "StringHash.h"
 #include "TextEncoding.h"
 #include <utils/Log.h>
+#include <wtf/HashMap.h>
 
 void MyResourceLoader::handleRequest() {
     if (protocolIs(m_url, "data"))
diff --git a/WebKit/android/benchmark/Intercept.h b/WebKit/android/benchmark/Intercept.h
index a5e50c7..2ae7f7b 100644
--- a/WebKit/android/benchmark/Intercept.h
+++ b/WebKit/android/benchmark/Intercept.h
@@ -30,9 +30,9 @@
 #include "MyJavaVM.h"
 #include "PlatformString.h"
 #include "Timer.h"
-#include "Vector.h"
 #include "WebCoreFrameBridge.h"
 #include "WebCoreResourceLoader.h"
+#include <wtf/Vector.h>
 
 namespace WebCore {
     class Page;