Remove C++11 requirement in WebKit2

Removes all use of C++11 specific features in WebKit2. This consists of
template<S<T>> syntax, a few uses of auto, and a single use of std::move.

Change-Id: I1bbd356c430802caf5f7440cd0d3bb2ba49ed098
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>

42 files changed, 168 insertions, 153 deletions

diff --git a/Source/WebKit2/UIProcess/API/C/WKPage.cpp b/Source/WebKit2/UIProcess/API/C/WKPage.cpp
index 611186f5a..2d9ae5e51 100644
--- a/Source/WebKit2/UIProcess/API/C/WKPage.cpp
+++ b/Source/WebKit2/UIProcess/API/C/WKPage.cpp
@@ -884,11 +884,11 @@ WKScrollPinningBehavior WKPageGetScrollPinningBehavior(WKPageRef page)
     ScrollPinningBehavior pinning = toImpl(page)->scrollPinningBehavior();
     
     switch (pinning) {
-    case WebCore::ScrollPinningBehavior::DoNotPin:
+    case DoNotPin:
         return kWKScrollPinningBehaviorDoNotPin;
-    case WebCore::ScrollPinningBehavior::PinToTop:
+    case PinToTop:
         return kWKScrollPinningBehaviorPinToTop;
-    case WebCore::ScrollPinningBehavior::PinToBottom:
+    case PinToBottom:
         return kWKScrollPinningBehaviorPinToBottom;
     }
     
@@ -898,17 +898,17 @@ WKScrollPinningBehavior WKPageGetScrollPinningBehavior(WKPageRef page)
 
 void WKPageSetScrollPinningBehavior(WKPageRef page, WKScrollPinningBehavior pinning)
 {
-    ScrollPinningBehavior corePinning = ScrollPinningBehavior::DoNotPin;
+    ScrollPinningBehavior corePinning = DoNotPin;
 
     switch (pinning) {
     case kWKScrollPinningBehaviorDoNotPin:
-        corePinning = ScrollPinningBehavior::DoNotPin;
+        corePinning = DoNotPin;
         break;
     case kWKScrollPinningBehaviorPinToTop:
-        corePinning = ScrollPinningBehavior::PinToTop;
+        corePinning = PinToTop;
         break;
     case kWKScrollPinningBehaviorPinToBottom:
-        corePinning = ScrollPinningBehavior::PinToBottom;
+        corePinning = PinToBottom;
         break;
     default:
         ASSERT_NOT_REACHED();
diff --git a/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.cpp b/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.cpp
index f9b9f3ea8..f1c1eecd0 100644
--- a/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.cpp
+++ b/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.cpp
@@ -67,7 +67,7 @@ void DownloadProxyMap::downloadFinished(DownloadProxy* downloadProxy)
 void DownloadProxyMap::processDidClose()
 {
     // Invalidate all outstanding downloads.
-    for (HashMap<uint64_t, RefPtr<DownloadProxy>>::iterator::Values it = m_downloads.begin().values(), end = m_downloads.end().values(); it != end; ++it) {
+    for (HashMap<uint64_t, RefPtr<DownloadProxy> >::iterator::Values it = m_downloads.begin().values(), end = m_downloads.end().values(); it != end; ++it) {
         (*it)->processDidClose();
         (*it)->invalidate();
     }
diff --git a/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.h b/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.h
index f1648ad9f..72359d55d 100644
--- a/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.h
+++ b/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.h
@@ -52,7 +52,7 @@ public:
 
 private:
     ChildProcessProxy* m_process;
-    HashMap<uint64_t, RefPtr<DownloadProxy>> m_downloads;
+    HashMap<uint64_t, RefPtr<DownloadProxy> > m_downloads;
 };
 
 } // namespace WebKit
diff --git a/Source/WebKit2/UIProcess/GeolocationPermissionRequestManagerProxy.h b/Source/WebKit2/UIProcess/GeolocationPermissionRequestManagerProxy.h
index a5f685a9b..98885bf07 100644
--- a/Source/WebKit2/UIProcess/GeolocationPermissionRequestManagerProxy.h
+++ b/Source/WebKit2/UIProcess/GeolocationPermissionRequestManagerProxy.h
@@ -46,7 +46,7 @@ public:
     void didReceiveGeolocationPermissionDecision(uint64_t, bool allow);
 
 private:
-    typedef HashMap<uint64_t, RefPtr<GeolocationPermissionRequestProxy>> PendingRequestMap;
+    typedef HashMap<uint64_t, RefPtr<GeolocationPermissionRequestProxy> > PendingRequestMap;
     PendingRequestMap m_pendingRequests;
     WebPageProxy* m_page;
 };
diff --git a/Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequestManagerProxy.h b/Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequestManagerProxy.h
index 72ef99f23..12775fb06 100644
--- a/Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequestManagerProxy.h
+++ b/Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequestManagerProxy.h
@@ -47,7 +47,7 @@ public:
     void didReceiveNotificationPermissionDecision(uint64_t notificationID, bool allow);
     
 private:
-    typedef HashMap<uint64_t, RefPtr<NotificationPermissionRequest>> PendingRequestMap;
+    typedef HashMap<uint64_t, RefPtr<NotificationPermissionRequest> > PendingRequestMap;
     PendingRequestMap m_pendingRequests;
     WebPageProxy* m_page;
 };
diff --git a/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp b/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp
index 9e462af9b..5bb3db5f7 100644
--- a/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp
+++ b/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp
@@ -118,7 +118,7 @@ void WebNotificationManagerProxy::cancel(WebPageProxy* webPage, uint64_t pageNot
     
 void WebNotificationManagerProxy::didDestroyNotification(WebPageProxy* webPage, uint64_t pageNotificationID)
 {
-    auto globalIDNotificationPair = m_notifications.take(make_pair(webPage->pageID(), pageNotificationID));
+    pair<uint64_t, RefPtr<WebNotification> > globalIDNotificationPair = m_notifications.take(make_pair(webPage->pageID(), pageNotificationID));
     if (uint64_t globalNotificationID = globalIDNotificationPair.first) {
         WebNotification* notification = globalIDNotificationPair.second.get();
         m_globalNotificationMap.remove(globalNotificationID);
@@ -153,19 +153,28 @@ void WebNotificationManagerProxy::clearNotifications(WebPageProxy* webPage, cons
     Vector<uint64_t> globalNotificationIDs;
     globalNotificationIDs.reserveCapacity(m_globalNotificationMap.size());
 
-    for (auto it = m_notifications.begin(), end = m_notifications.end(); it != end; ++it) {
-        uint64_t webPageID = it->key.first;
-        uint64_t pageNotificationID = it->key.second;
-        if (!filterFunction(webPageID, pageNotificationID, targetPageID, pageNotificationIDs))
-            continue;
-
-        uint64_t globalNotificationID = it->value.first;
-        globalNotificationIDs.append(globalNotificationID);
+    {
+        HashMap<pair<uint64_t, uint64_t>, pair<uint64_t, RefPtr<WebNotification> > >::iterator it  = m_notifications.begin();
+        HashMap<pair<uint64_t, uint64_t>, pair<uint64_t, RefPtr<WebNotification> > >::iterator end  = m_notifications.end();
+        for (; it != end; ++it) {
+            uint64_t webPageID = it->key.first;
+            uint64_t pageNotificationID = it->key.second;
+            if (!filterFunction(webPageID, pageNotificationID, targetPageID, pageNotificationIDs))
+                continue;
+
+            uint64_t globalNotificationID = it->value.first;
+            globalNotificationIDs.append(globalNotificationID);
+        }
     }
 
-    for (auto it = globalNotificationIDs.begin(), end = globalNotificationIDs.end(); it != end; ++it) {
-        auto pageNotification = m_globalNotificationMap.take(*it);
-        m_notifications.remove(pageNotification);
+
+    {
+        Vector<uint64_t>::iterator it = globalNotificationIDs.begin();
+        Vector<uint64_t>::iterator end = globalNotificationIDs.end();
+        for (; it != end; ++it) {
+            pair<uint64_t, uint64_t> pageNotification = m_globalNotificationMap.take(*it);
+            m_notifications.remove(pageNotification);
+        }
     }
 
     m_provider.clearNotifications(globalNotificationIDs);
@@ -173,7 +182,7 @@ void WebNotificationManagerProxy::clearNotifications(WebPageProxy* webPage, cons
 
 void WebNotificationManagerProxy::providerDidShowNotification(uint64_t globalNotificationID)
 {
-    auto it = m_globalNotificationMap.find(globalNotificationID);
+    HashMap<uint64_t, pair<uint64_t, uint64_t> >::iterator it = m_globalNotificationMap.find(globalNotificationID);
     if (it == m_globalNotificationMap.end())
         return;
 
@@ -188,7 +197,7 @@ void WebNotificationManagerProxy::providerDidShowNotification(uint64_t globalNot
 
 void WebNotificationManagerProxy::providerDidClickNotification(uint64_t globalNotificationID)
 {
-    auto it = m_globalNotificationMap.find(globalNotificationID);
+    HashMap<uint64_t, pair<uint64_t, uint64_t> >::iterator it = m_globalNotificationMap.find(globalNotificationID);
     if (it == m_globalNotificationMap.end())
         return;
     
@@ -204,16 +213,16 @@ void WebNotificationManagerProxy::providerDidClickNotification(uint64_t globalNo
 
 void WebNotificationManagerProxy::providerDidCloseNotifications(ImmutableArray* globalNotificationIDs)
 {
-    HashMap<WebPageProxy*, Vector<uint64_t>> pageNotificationIDs;
+    HashMap<WebPageProxy*, Vector<uint64_t> > pageNotificationIDs;
     
     size_t size = globalNotificationIDs->size();
     for (size_t i = 0; i < size; ++i) {
-        auto it = m_globalNotificationMap.find(globalNotificationIDs->at<WebUInt64>(i)->value());
+        HashMap<uint64_t, pair<uint64_t, uint64_t> >::iterator it = m_globalNotificationMap.find(globalNotificationIDs->at<WebUInt64>(i)->value());
         if (it == m_globalNotificationMap.end())
             continue;
 
         if (WebPageProxy* webPage = WebProcessProxy::webPage(it->value.first)) {
-            auto pageIt = pageNotificationIDs.find(webPage);
+            HashMap<WebPageProxy*, Vector<uint64_t> >::iterator pageIt = pageNotificationIDs.find(webPage);
             if (pageIt == pageNotificationIDs.end()) {
                 Vector<uint64_t> newVector;
                 newVector.reserveInitialCapacity(size);
@@ -228,7 +237,7 @@ void WebNotificationManagerProxy::providerDidCloseNotifications(ImmutableArray*
         m_globalNotificationMap.remove(it);
     }
 
-    for (auto it = pageNotificationIDs.begin(), end = pageNotificationIDs.end(); it != end; ++it)
+    for (HashMap<WebPageProxy*, Vector<uint64_t> >::iterator it = pageNotificationIDs.begin(), end = pageNotificationIDs.end(); it != end; ++it)
         it->key->process()->send(Messages::WebNotificationManager::DidCloseNotifications(it->value), 0);
 }
 
diff --git a/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h b/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h
index 5890b5c1b..98b472e82 100644
--- a/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h
+++ b/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h
@@ -81,9 +81,9 @@ private:
 
     WebNotificationProvider m_provider;
     // Pair comprised of web page ID and the web process's notification ID
-    HashMap<uint64_t, pair<uint64_t, uint64_t>> m_globalNotificationMap;
+    HashMap<uint64_t, pair<uint64_t, uint64_t> > m_globalNotificationMap;
     // Key pair comprised of web page ID and the web process's notification ID; value pair comprised of global notification ID, and notification object
-    HashMap<pair<uint64_t, uint64_t>, pair<uint64_t, RefPtr<WebNotification>>> m_notifications;
+    HashMap<pair<uint64_t, uint64_t>, pair<uint64_t, RefPtr<WebNotification> > > m_notifications;
 };
 
 } // namespace WebKit
diff --git a/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp b/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp
index 6af593a54..e89accaf4 100644
--- a/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp
+++ b/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp
@@ -71,7 +71,11 @@ uint64_t PluginProcessManager::pluginProcessToken(const PluginModuleInfo& plugin
     attributes.processType = pluginProcessType;
     attributes.sandboxPolicy = pluginProcessSandboxPolicy;
 
+#if COMPILER_SUPPORTS(CXX_RVALUE_REFERENCES)
     m_pluginProcessTokens.append(std::make_pair(std::move(attributes), token));
+#else
+    m_pluginProcessTokens.append(std::make_pair(attributes, token));
+#endif
     m_knownTokens.add(token);
 
     return token;
@@ -113,7 +117,7 @@ PluginProcessProxy* PluginProcessManager::getOrCreatePluginProcess(uint64_t plug
     }
 
     for (size_t i = 0; i < m_pluginProcessTokens.size(); ++i) {
-        auto& attributesAndToken = m_pluginProcessTokens[i];
+        std::pair<PluginProcessAttributes, uint64_t>& attributesAndToken = m_pluginProcessTokens[i];
         if (attributesAndToken.second == pluginProcessToken) {
             RefPtr<PluginProcessProxy> pluginProcess = PluginProcessProxy::create(this, attributesAndToken.first, attributesAndToken.second);
             PluginProcessProxy* pluginProcessPtr = pluginProcess.get();
diff --git a/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h b/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h
index 307c39810..0ffd4099a 100644
--- a/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h
+++ b/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h
@@ -70,10 +70,10 @@ private:
 
     PluginProcessProxy* getOrCreatePluginProcess(uint64_t pluginProcessToken);
 
-    Vector<std::pair<PluginProcessAttributes, uint64_t>> m_pluginProcessTokens;
+    Vector<std::pair<PluginProcessAttributes, uint64_t> > m_pluginProcessTokens;
     HashSet<uint64_t> m_knownTokens;
 
-    Vector<RefPtr<PluginProcessProxy>> m_pluginProcesses;
+    Vector<RefPtr<PluginProcessProxy> > m_pluginProcesses;
 };
 
 } // namespace WebKit
diff --git a/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h b/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h
index 1cb2268a9..a76cba196 100644
--- a/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h
+++ b/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h
@@ -151,10 +151,10 @@ private:
     // The connection to the plug-in host process.
     RefPtr<CoreIPC::Connection> m_connection;
 
-    Deque<RefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply>> m_pendingConnectionReplies;
+    Deque<RefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply> > m_pendingConnectionReplies;
 
     Vector<uint64_t> m_pendingGetSitesRequests;
-    HashMap<uint64_t, RefPtr<WebPluginSiteDataManager>> m_pendingGetSitesReplies;
+    HashMap<uint64_t, RefPtr<WebPluginSiteDataManager> > m_pendingGetSitesReplies;
 
     struct ClearSiteDataRequest {
         Vector<String> sites;
@@ -163,7 +163,7 @@ private:
         uint64_t callbackID;
     };
     Vector<ClearSiteDataRequest> m_pendingClearSiteDataRequests;
-    HashMap<uint64_t, RefPtr<WebPluginSiteDataManager>> m_pendingClearSiteDataReplies;
+    HashMap<uint64_t, RefPtr<WebPluginSiteDataManager> > m_pendingClearSiteDataReplies;
 
     // If createPluginConnection is called while the process is still launching we'll keep count of it and send a bunch of requests
     // when the process finishes launching.
diff --git a/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp b/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp
index 005591cc8..1ea01a088 100644
--- a/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp
+++ b/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp
@@ -181,7 +181,7 @@ void WebPluginSiteDataManager::didGetSitesWithData(const Vector<String>& sites,
         return;
     }
 
-    Vector<RefPtr<APIObject>> sitesWK(sites.size());
+    Vector<RefPtr<APIObject> > sitesWK(sites.size());
 
     for (size_t i = 0; i < sites.size(); ++i)
         sitesWK[i] = WebString::create(sites[i]);
diff --git a/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h b/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h
index 1edeceef8..8430a2330 100644
--- a/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h
+++ b/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h
@@ -66,18 +66,18 @@ private:
     explicit WebPluginSiteDataManager(WebContext*);
 
     WebContext* m_webContext;
-    HashMap<uint64_t, RefPtr<ArrayCallback>> m_arrayCallbacks;
-    HashMap<uint64_t, RefPtr<VoidCallback>> m_voidCallbacks;
+    HashMap<uint64_t, RefPtr<ArrayCallback> > m_arrayCallbacks;
+    HashMap<uint64_t, RefPtr<VoidCallback> > m_voidCallbacks;
 
 #if ENABLE(PLUGIN_PROCESS)
     void didGetSitesWithDataForAllPlugins(const Vector<String>& sites, uint64_t callbackID);
     void didClearSiteDataForAllPlugins(uint64_t callbackID);
 
     class GetSitesWithDataState;
-    HashMap<uint64_t, OwnPtr<GetSitesWithDataState>> m_pendingGetSitesWithData;
+    HashMap<uint64_t, OwnPtr<GetSitesWithDataState> > m_pendingGetSitesWithData;
 
     class ClearSiteDataState;
-    HashMap<uint64_t, OwnPtr<ClearSiteDataState>> m_pendingClearSiteData;
+    HashMap<uint64_t, OwnPtr<ClearSiteDataState> > m_pendingClearSiteData;
 #endif
 };
 
diff --git a/Source/WebKit2/UIProcess/SharedWorkers/SharedWorkerProcessManager.h b/Source/WebKit2/UIProcess/SharedWorkers/SharedWorkerProcessManager.h
index cd30dc00c..299133879 100644
--- a/Source/WebKit2/UIProcess/SharedWorkers/SharedWorkerProcessManager.h
+++ b/Source/WebKit2/UIProcess/SharedWorkers/SharedWorkerProcessManager.h
@@ -62,7 +62,7 @@ private:
 
     SharedWorkerProcessProxy* getOrCreateSharedWorkerProcess(const String& url, const String& name);
 
-    Vector<RefPtr<SharedWorkerProcessProxy>> m_sharedWorkerProcesses;
+    Vector<RefPtr<SharedWorkerProcessProxy> > m_sharedWorkerProcesses;
 };
 
 } // namespace WebKit
diff --git a/Source/WebKit2/UIProcess/StatisticsRequest.cpp b/Source/WebKit2/UIProcess/StatisticsRequest.cpp
index d2b22fa5b..0fa1fb7a7 100644
--- a/Source/WebKit2/UIProcess/StatisticsRequest.cpp
+++ b/Source/WebKit2/UIProcess/StatisticsRequest.cpp
@@ -86,7 +86,7 @@ void StatisticsRequest::completedRequest(uint64_t requestID, const StatisticsDat
     
     size_t cacheStatisticsCount = data.webCoreCacheStatistics.size();
     if (cacheStatisticsCount) {
-        Vector<RefPtr<APIObject>> cacheStatisticsVector(cacheStatisticsCount);
+        Vector<RefPtr<APIObject> > cacheStatisticsVector(cacheStatisticsCount);
         for (size_t i = 0; i < cacheStatisticsCount; ++i)
             cacheStatisticsVector[i] = createDictionaryFromHashMap(data.webCoreCacheStatistics[i]);
         m_responseDictionary->set("WebCoreCacheStatistics", ImmutableArray::adopt(cacheStatisticsVector).get());
diff --git a/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp b/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp
index 7c58578eb..4dbb9eab1 100644
--- a/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp
+++ b/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp
@@ -258,7 +258,7 @@ void LocalStorageDatabase::updateDatabase()
         m_changedItems.swap(changedItems);
     } else {
         for (int i = 0; i < maximumItemsToUpdate; ++i) {
-            auto it = m_changedItems.begin();
+            HashMap<String, String>::iterator it = m_changedItems.begin();
             changedItems.add(it->key, it->value);
 
             m_changedItems.remove(it);
@@ -311,7 +311,9 @@ void LocalStorageDatabase::updateDatabaseWithChangedItems(const HashMap<String,
     SQLiteTransaction transaction(m_database);
     transaction.begin();
 
-    for (auto it = changedItems.begin(), end = changedItems.end(); it != end; ++it) {
+    HashMap<String, String>::const_iterator it = changedItems.begin();
+    const HashMap<String, String>::const_iterator end = changedItems.end();
+    for (; it != end; ++it) {
         // A null value means that the key/value pair should be deleted.
         SQLiteStatement& statement = it->value.isNull() ? deleteStatement : insertStatement;
 
diff --git a/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp b/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp
index 1612444e1..3a106e0d0 100644
--- a/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp
+++ b/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp
@@ -121,9 +121,9 @@ void LocalStorageDatabaseTracker::deleteAllDatabases()
     deleteEmptyDirectory(m_localStorageDirectory);
 }
 
-Vector<RefPtr<WebCore::SecurityOrigin>> LocalStorageDatabaseTracker::origins() const
+Vector<RefPtr<WebCore::SecurityOrigin> > LocalStorageDatabaseTracker::origins() const
 {
-    Vector<RefPtr<SecurityOrigin>> origins;
+    Vector<RefPtr<SecurityOrigin> > origins;
     origins.reserveInitialCapacity(m_origins.size());
 
     for (HashSet<String>::const_iterator it = m_origins.begin(), end = m_origins.end(); it != end; ++it)
@@ -232,7 +232,7 @@ void LocalStorageDatabaseTracker::updateTrackerDatabaseFromLocalStorageDatabaseF
         originsFromLocalStorageDatabaseFiles.add(originIdentifier);
     }
 
-    for (auto it = origins.begin(), end = origins.end(); it != end; ++it) {
+    for (HashSet<String>::iterator it = origins.begin(), end = origins.end(); it != end; ++it) {
         const String& originIdentifier = *it;
         if (origins.contains(originIdentifier))
             continue;
diff --git a/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h b/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h
index e16428907..1e633512d 100644
--- a/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h
+++ b/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h
@@ -54,7 +54,7 @@ public:
     void deleteDatabaseWithOrigin(WebCore::SecurityOrigin*);
     void deleteAllDatabases();
 
-    Vector<RefPtr<WebCore::SecurityOrigin>> origins() const;
+    Vector<RefPtr<WebCore::SecurityOrigin> > origins() const;
 
 private:
     explicit LocalStorageDatabaseTracker(PassRefPtr<WorkQueue>);
diff --git a/Source/WebKit2/UIProcess/Storage/StorageManager.cpp b/Source/WebKit2/UIProcess/Storage/StorageManager.cpp
index 5350dde05..8e5dbef8b 100644
--- a/Source/WebKit2/UIProcess/Storage/StorageManager.cpp
+++ b/Source/WebKit2/UIProcess/Storage/StorageManager.cpp
@@ -76,7 +76,7 @@ private:
     unsigned m_quotaInBytes;
 
     RefPtr<StorageMap> m_storageMap;
-    HashSet<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>> m_eventListeners;
+    HashSet<std::pair<RefPtr<CoreIPC::Connection>, uint64_t> > m_eventListeners;
 };
 
 class StorageManager::LocalStorageNamespace : public ThreadSafeRefCounted<LocalStorageNamespace> {
@@ -218,7 +218,7 @@ void StorageManager::StorageArea::clear()
         m_localStorageDatabase = nullptr;
     }
 
-    for (auto it = m_eventListeners.begin(), end = m_eventListeners.end(); it != end; ++it)
+    for (HashSet<std::pair<RefPtr<CoreIPC::Connection>, uint64_t> >::iterator it = m_eventListeners.begin(), end = m_eventListeners.end(); it != end; ++it)
         it->first->send(Messages::StorageAreaMap::ClearCache(), it->second);
 }
 
@@ -240,7 +240,7 @@ void StorageManager::StorageArea::openDatabaseAndImportItemsIfNeeded()
 
 void StorageManager::StorageArea::dispatchEvents(CoreIPC::Connection* sourceConnection, uint64_t sourceStorageAreaID, const String& key, const String& oldValue, const String& newValue, const String& urlString) const
 {
-    for (HashSet<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>>::const_iterator it = m_eventListeners.begin(), end = m_eventListeners.end(); it != end; ++it) {
+    for (HashSet<std::pair<RefPtr<CoreIPC::Connection>, uint64_t> >::const_iterator it = m_eventListeners.begin(), end = m_eventListeners.end(); it != end; ++it) {
         uint64_t storageAreaID = it->first == sourceConnection ? sourceStorageAreaID : 0;
 
         it->first->send(Messages::StorageAreaMap::DispatchStorageEvent(storageAreaID, key, oldValue, newValue, urlString), it->second);
@@ -292,7 +292,7 @@ void StorageManager::LocalStorageNamespace::didDestroyStorageArea(StorageArea* s
 
 void StorageManager::LocalStorageNamespace::clearStorageAreasMatchingOrigin(SecurityOrigin* securityOrigin)
 {
-    for (auto it = m_storageAreaMap.begin(), end = m_storageAreaMap.end(); it != end; ++it) {
+    for (HashMap<RefPtr<SecurityOrigin>, StorageArea*>::iterator it = m_storageAreaMap.begin(), end = m_storageAreaMap.end(); it != end; ++it) {
         if (it->key->equal(securityOrigin))
             it->value->clear();
     }
@@ -300,7 +300,7 @@ void StorageManager::LocalStorageNamespace::clearStorageAreasMatchingOrigin(Secu
 
 void StorageManager::LocalStorageNamespace::clearAllStorageAreas()
 {
-    for (auto it = m_storageAreaMap.begin(), end = m_storageAreaMap.end(); it != end; ++it)
+    for (HashMap<RefPtr<SecurityOrigin>, StorageArea*>::iterator it = m_storageAreaMap.begin(), end = m_storageAreaMap.end(); it != end; ++it)
         it->value->clear();
 }
 
@@ -324,7 +324,7 @@ private:
     RefPtr<CoreIPC::Connection> m_allowedConnection;
     unsigned m_quotaInBytes;
 
-    HashMap<RefPtr<SecurityOrigin>, RefPtr<StorageArea>> m_storageAreaMap;
+    HashMap<RefPtr<SecurityOrigin>, RefPtr<StorageArea> > m_storageAreaMap;
 };
 
 PassRefPtr<StorageManager::SessionStorageNamespace> StorageManager::SessionStorageNamespace::create(CoreIPC::Connection* allowedConnection, unsigned quotaInBytes)
@@ -351,7 +351,7 @@ void StorageManager::SessionStorageNamespace::setAllowedConnection(CoreIPC::Conn
 
 PassRefPtr<StorageManager::StorageArea> StorageManager::SessionStorageNamespace::getOrCreateStorageArea(PassRefPtr<SecurityOrigin> securityOrigin)
 {
-    HashMap<RefPtr<SecurityOrigin>, RefPtr<StorageArea>>::AddResult result = m_storageAreaMap.add(securityOrigin, 0);
+    HashMap<RefPtr<SecurityOrigin>, RefPtr<StorageArea> >::AddResult result = m_storageAreaMap.add(securityOrigin, 0);
     if (result.isNewEntry)
         result.iterator->value = StorageArea::create(0, result.iterator->key, m_quotaInBytes);
 
@@ -362,7 +362,7 @@ void StorageManager::SessionStorageNamespace::cloneTo(SessionStorageNamespace& n
 {
     ASSERT_UNUSED(newSessionStorageNamespace, newSessionStorageNamespace.isEmpty());
 
-    for (HashMap<RefPtr<SecurityOrigin>, RefPtr<StorageArea>>::const_iterator it = m_storageAreaMap.begin(), end = m_storageAreaMap.end(); it != end; ++it)
+    for (HashMap<RefPtr<SecurityOrigin>, RefPtr<StorageArea> >::const_iterator it = m_storageAreaMap.begin(), end = m_storageAreaMap.end(); it != end; ++it)
         newSessionStorageNamespace.m_storageAreaMap.add(it->key, it->value->clone());
 }
 
@@ -420,7 +420,7 @@ void StorageManager::processWillCloseConnection(WebProcessProxy* webProcessProxy
     m_queue->dispatch(bind(&StorageManager::invalidateConnectionInternal, this, RefPtr<CoreIPC::Connection>(webProcessProxy->connection())));
 }
 
-void StorageManager::getOrigins(FunctionDispatcher* callbackDispatcher, void* context, void (*callback)(const Vector<RefPtr<WebCore::SecurityOrigin>>& securityOrigins, void* context))
+void StorageManager::getOrigins(FunctionDispatcher* callbackDispatcher, void* context, void (*callback)(const Vector<RefPtr<WebCore::SecurityOrigin> >& securityOrigins, void* context))
 {
     m_queue->dispatch(bind(&StorageManager::getOriginsInternal, this, RefPtr<FunctionDispatcher>(callbackDispatcher), context, callback));
 }
@@ -440,13 +440,13 @@ void StorageManager::createLocalStorageMap(CoreIPC::Connection* connection, uint
     std::pair<RefPtr<CoreIPC::Connection>, uint64_t> connectionAndStorageMapIDPair(connection, storageMapID);
 
     // FIXME: This should be a message check.
-    ASSERT((HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea>>::isValidKey(connectionAndStorageMapIDPair)));
+    ASSERT((HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> >::isValidKey(connectionAndStorageMapIDPair)));
 
-    HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea>>::AddResult result = m_storageAreasByConnection.add(connectionAndStorageMapIDPair, 0);
+    HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> >::AddResult result = m_storageAreasByConnection.add(connectionAndStorageMapIDPair, 0);
 
     // FIXME: These should be a message checks.
     ASSERT(result.isNewEntry);
-    ASSERT((HashMap<uint64_t, RefPtr<LocalStorageNamespace>>::isValidKey(storageNamespaceID)));
+    ASSERT((HashMap<uint64_t, RefPtr<LocalStorageNamespace> >::isValidKey(storageNamespaceID)));
 
     LocalStorageNamespace* localStorageNamespace = getOrCreateLocalStorageNamespace(storageNamespaceID);
 
@@ -462,7 +462,7 @@ void StorageManager::createLocalStorageMap(CoreIPC::Connection* connection, uint
 void StorageManager::createSessionStorageMap(CoreIPC::Connection* connection, uint64_t storageMapID, uint64_t storageNamespaceID, const SecurityOriginData& securityOriginData)
 {
     // FIXME: This should be a message check.
-    ASSERT((HashMap<uint64_t, RefPtr<SessionStorageNamespace>>::isValidKey(storageNamespaceID)));
+    ASSERT((HashMap<uint64_t, RefPtr<SessionStorageNamespace> >::isValidKey(storageNamespaceID)));
     SessionStorageNamespace* sessionStorageNamespace = m_sessionStorageNamespaces.get(storageNamespaceID);
     if (!sessionStorageNamespace) {
         // We're getting an incoming message from the web process that's for session storage for a web page
@@ -473,9 +473,9 @@ void StorageManager::createSessionStorageMap(CoreIPC::Connection* connection, ui
     std::pair<RefPtr<CoreIPC::Connection>, uint64_t> connectionAndStorageMapIDPair(connection, storageMapID);
 
     // FIXME: This should be a message check.
-    ASSERT((HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea>>::isValidKey(connectionAndStorageMapIDPair)));
+    ASSERT((HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> >::isValidKey(connectionAndStorageMapIDPair)));
 
-    HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea>>::AddResult result = m_storageAreasByConnection.add(connectionAndStorageMapIDPair, 0);
+    HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> >::AddResult result = m_storageAreasByConnection.add(connectionAndStorageMapIDPair, 0);
 
     // FIXME: This should be a message check.
     ASSERT(result.isNewEntry);
@@ -494,9 +494,9 @@ void StorageManager::destroyStorageMap(CoreIPC::Connection* connection, uint64_t
     std::pair<RefPtr<CoreIPC::Connection>, uint64_t> connectionAndStorageMapIDPair(connection, storageMapID);
 
     // FIXME: This should be a message check.
-    ASSERT((HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea>>::isValidKey(connectionAndStorageMapIDPair)));
+    ASSERT((HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> >::isValidKey(connectionAndStorageMapIDPair)));
 
-    HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea>>::iterator it = m_storageAreasByConnection.find(connectionAndStorageMapIDPair);
+    HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> >::iterator it = m_storageAreasByConnection.find(connectionAndStorageMapIDPair);
     if (it == m_storageAreasByConnection.end()) {
         // The connection has been removed because the last page was closed.
         return;
@@ -588,9 +588,9 @@ void StorageManager::cloneSessionStorageNamespaceInternal(uint64_t storageNamesp
 
 void StorageManager::invalidateConnectionInternal(CoreIPC::Connection* connection)
 {
-    Vector<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>> connectionAndStorageMapIDPairsToRemove;
-    HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea>> storageAreasByConnection = m_storageAreasByConnection;
-    for (HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea>>::const_iterator it = storageAreasByConnection.begin(), end = storageAreasByConnection.end(); it != end; ++it) {
+    Vector<std::pair<RefPtr<CoreIPC::Connection>, uint64_t> > connectionAndStorageMapIDPairsToRemove;
+    HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> > storageAreasByConnection = m_storageAreasByConnection;
+    for (HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> >::const_iterator it = storageAreasByConnection.begin(), end = storageAreasByConnection.end(); it != end; ++it) {
         if (it->key.first != connection)
             continue;
 
@@ -605,7 +605,7 @@ void StorageManager::invalidateConnectionInternal(CoreIPC::Connection* connectio
 StorageManager::StorageArea* StorageManager::findStorageArea(CoreIPC::Connection* connection, uint64_t storageMapID) const
 {
     std::pair<CoreIPC::Connection*, uint64_t> connectionAndStorageMapIDPair(connection, storageMapID);
-    if (!HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea>>::isValidKey(connectionAndStorageMapIDPair))
+    if (!HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> >::isValidKey(connectionAndStorageMapIDPair))
         return 0;
 
     return m_storageAreasByConnection.get(connectionAndStorageMapIDPair);
@@ -613,31 +613,31 @@ StorageManager::StorageArea* StorageManager::findStorageArea(CoreIPC::Connection
 
 StorageManager::LocalStorageNamespace* StorageManager::getOrCreateLocalStorageNamespace(uint64_t storageNamespaceID)
 {
-    if (!HashMap<uint64_t, RefPtr<LocalStorageNamespace>>::isValidKey(storageNamespaceID))
+    if (!HashMap<uint64_t, RefPtr<LocalStorageNamespace> >::isValidKey(storageNamespaceID))
         return 0;
 
-    HashMap<uint64_t, RefPtr<LocalStorageNamespace>>::AddResult result = m_localStorageNamespaces.add(storageNamespaceID, 0);
+    HashMap<uint64_t, RefPtr<LocalStorageNamespace> >::AddResult result = m_localStorageNamespaces.add(storageNamespaceID, 0);
     if (result.isNewEntry)
         result.iterator->value = LocalStorageNamespace::create(this, storageNamespaceID);
 
     return result.iterator->value.get();
 }
 
-static void callCallbackFunction(void* context, void (*callbackFunction)(const Vector<RefPtr<WebCore::SecurityOrigin>>& securityOrigins, void* context), Vector<RefPtr<WebCore::SecurityOrigin>>* securityOriginsPtr)
+static void callCallbackFunction(void* context, void (*callbackFunction)(const Vector<RefPtr<WebCore::SecurityOrigin> >& securityOrigins, void* context), Vector<RefPtr<WebCore::SecurityOrigin> >* securityOriginsPtr)
 {
-    OwnPtr<Vector<RefPtr<WebCore::SecurityOrigin>>> securityOrigins = adoptPtr(securityOriginsPtr);
+    OwnPtr<Vector<RefPtr<WebCore::SecurityOrigin> > > securityOrigins = adoptPtr(securityOriginsPtr);
     callbackFunction(*securityOrigins, context);
 }
 
-void StorageManager::getOriginsInternal(FunctionDispatcher* dispatcher, void* context, void (*callbackFunction)(const Vector<RefPtr<WebCore::SecurityOrigin>>& securityOrigins, void* context))
+void StorageManager::getOriginsInternal(FunctionDispatcher* dispatcher, void* context, void (*callbackFunction)(const Vector<RefPtr<WebCore::SecurityOrigin> >& securityOrigins, void* context))
 {
-    OwnPtr<Vector<RefPtr<WebCore::SecurityOrigin>>> securityOrigins = adoptPtr(new Vector<RefPtr<WebCore::SecurityOrigin>>(m_localStorageDatabaseTracker->origins()));
+    OwnPtr<Vector<RefPtr<WebCore::SecurityOrigin> > > securityOrigins = adoptPtr(new Vector<RefPtr<WebCore::SecurityOrigin> >(m_localStorageDatabaseTracker->origins()));
     dispatcher->dispatch(bind(callCallbackFunction, context, callbackFunction, securityOrigins.leakPtr()));
 }
 
 void StorageManager::deleteEntriesForOriginInternal(SecurityOrigin* securityOrigin)
 {
-    for (auto it = m_localStorageNamespaces.begin(), end = m_localStorageNamespaces.end(); it != end; ++it)
+    for (HashMap<uint64_t, RefPtr<LocalStorageNamespace> >::iterator it = m_localStorageNamespaces.begin(), end = m_localStorageNamespaces.end(); it != end; ++it)
         it->value->clearStorageAreasMatchingOrigin(securityOrigin);
 
     m_localStorageDatabaseTracker->deleteDatabaseWithOrigin(securityOrigin);
@@ -645,7 +645,7 @@ void StorageManager::deleteEntriesForOriginInternal(SecurityOrigin* securityOrig
 
 void StorageManager::deleteAllEntriesInternal()
 {
-    for (auto it = m_localStorageNamespaces.begin(), end = m_localStorageNamespaces.end(); it != end; ++it)
+    for (HashMap<uint64_t, RefPtr<LocalStorageNamespace> >::iterator it = m_localStorageNamespaces.begin(), end = m_localStorageNamespaces.end(); it != end; ++it)
         it->value->clearAllStorageAreas();
 
     m_localStorageDatabaseTracker->deleteAllDatabases();
diff --git a/Source/WebKit2/UIProcess/Storage/StorageManager.h b/Source/WebKit2/UIProcess/Storage/StorageManager.h
index 5fc5261e4..2f0f5bfa9 100644
--- a/Source/WebKit2/UIProcess/Storage/StorageManager.h
+++ b/Source/WebKit2/UIProcess/Storage/StorageManager.h
@@ -61,7 +61,7 @@ public:
 
     // FIXME: Instead of a context + C function, this should take a WTF::Function, but we currently don't
     // support arguments in functions.
-    void getOrigins(FunctionDispatcher* callbackDispatcher, void* context, void (*callback)(const Vector<RefPtr<WebCore::SecurityOrigin>>& securityOrigins, void* context));
+    void getOrigins(FunctionDispatcher* callbackDispatcher, void* context, void (*callback)(const Vector<RefPtr<WebCore::SecurityOrigin> >& securityOrigins, void* context));
     void deleteEntriesForOrigin(WebCore::SecurityOrigin*);
     void deleteAllEntries();
 
@@ -95,19 +95,19 @@ private:
     class LocalStorageNamespace;
     LocalStorageNamespace* getOrCreateLocalStorageNamespace(uint64_t storageNamespaceID);
 
-    void getOriginsInternal(FunctionDispatcher* callbackDispatcher, void* context, void (*callback)(const Vector<RefPtr<WebCore::SecurityOrigin>>& securityOrigins, void* context));
+    void getOriginsInternal(FunctionDispatcher* callbackDispatcher, void* context, void (*callback)(const Vector<RefPtr<WebCore::SecurityOrigin> >& securityOrigins, void* context));
     void deleteEntriesForOriginInternal(WebCore::SecurityOrigin*);
     void deleteAllEntriesInternal();
 
     RefPtr<WorkQueue> m_queue;
 
     RefPtr<LocalStorageDatabaseTracker> m_localStorageDatabaseTracker;
-    HashMap<uint64_t, RefPtr<LocalStorageNamespace>> m_localStorageNamespaces;
+    HashMap<uint64_t, RefPtr<LocalStorageNamespace> > m_localStorageNamespaces;
 
     class SessionStorageNamespace;
-    HashMap<uint64_t, RefPtr<SessionStorageNamespace>> m_sessionStorageNamespaces;
+    HashMap<uint64_t, RefPtr<SessionStorageNamespace> > m_sessionStorageNamespaces;
 
-    HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea>> m_storageAreasByConnection;
+    HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> > m_storageAreasByConnection;
 };
 
 } // namespace WebKit
diff --git a/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h b/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h
index f5f8ce1c4..ee5a27051 100644
--- a/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h
+++ b/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h
@@ -75,7 +75,7 @@ private:
     // CoreIPC::MessageReceiver
     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
 
-    HashMap<uint64_t, RefPtr<ArrayCallback>> m_arrayCallbacks;
+    HashMap<uint64_t, RefPtr<ArrayCallback> > m_arrayCallbacks;
 };
 
 } // namespace WebKit
diff --git a/Source/WebKit2/UIProcess/WebBackForwardList.cpp b/Source/WebKit2/UIProcess/WebBackForwardList.cpp
index 18c93ecd4..763023d07 100644
--- a/Source/WebKit2/UIProcess/WebBackForwardList.cpp
+++ b/Source/WebKit2/UIProcess/WebBackForwardList.cpp
@@ -74,7 +74,7 @@ void WebBackForwardList::addItem(WebBackForwardListItem* newItem)
     if (!m_capacity || !newItem || !m_page)
         return;
 
-    Vector<RefPtr<APIObject>> removedItems;
+    Vector<RefPtr<APIObject> > removedItems;
     
     if (m_hasCurrentIndex) {
         // Toss everything in the forward list.
@@ -212,7 +212,7 @@ PassRefPtr<ImmutableArray> WebBackForwardList::backListAsImmutableArrayWithLimit
     if (!size)
         return ImmutableArray::create();
 
-    Vector<RefPtr<APIObject>> vector;
+    Vector<RefPtr<APIObject> > vector;
     vector.reserveInitialCapacity(size);
 
     ASSERT(backListSize >= size);
@@ -235,7 +235,7 @@ PassRefPtr<ImmutableArray> WebBackForwardList::forwardListAsImmutableArrayWithLi
     if (!size)
         return ImmutableArray::create();
 
-    Vector<RefPtr<APIObject>> vector;
+    Vector<RefPtr<APIObject> > vector;
     vector.reserveInitialCapacity(size);
 
     unsigned last = m_currentIndex + size;
@@ -257,7 +257,7 @@ void WebBackForwardList::clear()
         return;
 
     RefPtr<WebBackForwardListItem> currentItem = this->currentItem();
-    Vector<RefPtr<APIObject>> removedItems;
+    Vector<RefPtr<APIObject> > removedItems;
 
     if (!currentItem) {
         // We should only ever have no current item if we also have no current item index.
diff --git a/Source/WebKit2/UIProcess/WebBackForwardList.h b/Source/WebKit2/UIProcess/WebBackForwardList.h
index 0525d5826..ecef42b4f 100644
--- a/Source/WebKit2/UIProcess/WebBackForwardList.h
+++ b/Source/WebKit2/UIProcess/WebBackForwardList.h
@@ -39,7 +39,7 @@
 
 namespace WebKit {
 
-typedef Vector<RefPtr<WebBackForwardListItem>> BackForwardListItemVector;
+typedef Vector<RefPtr<WebBackForwardListItem> > BackForwardListItemVector;
 
 /*
  *          Current
diff --git a/Source/WebKit2/UIProcess/WebContext.cpp b/Source/WebKit2/UIProcess/WebContext.cpp
index e1ef1021d..aee99940a 100644
--- a/Source/WebKit2/UIProcess/WebContext.cpp
+++ b/Source/WebKit2/UIProcess/WebContext.cpp
@@ -557,7 +557,7 @@ WebProcessProxy* WebContext::createNewWebProcess()
 
     if (m_processModel == ProcessModelSharedSecondaryProcess) {
         for (size_t i = 0; i != m_messagesToInjectedBundlePostedToEmptyContext.size(); ++i) {
-            pair<String, RefPtr<APIObject>>& message = m_messagesToInjectedBundlePostedToEmptyContext[i];
+            pair<String, RefPtr<APIObject> >& message = m_messagesToInjectedBundlePostedToEmptyContext[i];
 
             OwnPtr<CoreIPC::ArgumentEncoder> messageData = CoreIPC::ArgumentEncoder::create();
 
@@ -589,7 +589,7 @@ void WebContext::warmInitialProcess()
 void WebContext::enableProcessTermination()
 {
     m_processTerminationEnabled = true;
-    Vector<RefPtr<WebProcessProxy>> processes = m_processes;
+    Vector<RefPtr<WebProcessProxy> > processes = m_processes;
     for (size_t i = 0; i < processes.size(); ++i) {
         if (shouldTerminate(processes[i].get()))
             processes[i]->terminate();
@@ -1226,7 +1226,7 @@ void WebContext::pluginInfoStoreDidLoadPlugins(PluginInfoStore* store)
 #endif
     ASSERT(store == &m_pluginInfoStore);
 
-    Vector<RefPtr<APIObject>> pluginArray;
+    Vector<RefPtr<APIObject> > pluginArray;
 
     Vector<PluginModuleInfo> plugins = m_pluginInfoStore.plugins();
     for (size_t i = 0; i < plugins.size(); ++i) {
@@ -1236,7 +1236,7 @@ void WebContext::pluginInfoStoreDidLoadPlugins(PluginInfoStore* store)
         map.set(ASCIILiteral("name"), WebString::create(plugin.info.name));
         map.set(ASCIILiteral("file"), WebString::create(plugin.info.file));
         map.set(ASCIILiteral("desc"), WebString::create(plugin.info.desc));
-        Vector<RefPtr<APIObject>> mimeArray;
+        Vector<RefPtr<APIObject> > mimeArray;
         for (size_t j = 0; j <  plugin.info.mimes.size(); ++j)
             mimeArray.append(WebString::create(plugin.info.mimes[j].type));
         map.set(ASCIILiteral("mimes"), ImmutableArray::adopt(mimeArray));
diff --git a/Source/WebKit2/UIProcess/WebContext.h b/Source/WebKit2/UIProcess/WebContext.h
index 4e9958d83..84a385653 100644
--- a/Source/WebKit2/UIProcess/WebContext.h
+++ b/Source/WebKit2/UIProcess/WebContext.h
@@ -389,7 +389,7 @@ private:
     ProcessModel m_processModel;
     unsigned m_webProcessCountLimit; // The limit has no effect when process model is ProcessModelSharedSecondaryProcess.
     
-    Vector<RefPtr<WebProcessProxy>> m_processes;
+    Vector<RefPtr<WebProcessProxy> > m_processes;
     bool m_haveInitialEmptyProcess;
 
     WebProcessProxy* m_processWithPageCache;
@@ -424,7 +424,7 @@ private:
 
     // Messages that were posted before any pages were created.
     // The client should use initialization messages instead, so that a restarted process would get the same state.
-    Vector<pair<String, RefPtr<APIObject>>> m_messagesToInjectedBundlePostedToEmptyContext;
+    Vector<pair<String, RefPtr<APIObject> > > m_messagesToInjectedBundlePostedToEmptyContext;
 
     CacheModel m_cacheModel;
 
@@ -438,7 +438,7 @@ private:
 
     RefPtr<StorageManager> m_storageManager;
 
-    typedef HashMap<const char*, RefPtr<WebContextSupplement>, PtrHash<const char*>> WebContextSupplementMap;
+    typedef HashMap<const char*, RefPtr<WebContextSupplement>, PtrHash<const char*> > WebContextSupplementMap;
     WebContextSupplementMap m_supplements;
 
 #if USE(SOUP)
@@ -472,8 +472,8 @@ private:
     RefPtr<NetworkProcessProxy> m_networkProcess;
 #endif
     
-    HashMap<uint64_t, RefPtr<DictionaryCallback>> m_dictionaryCallbacks;
-    HashMap<uint64_t, RefPtr<StatisticsRequest>> m_statisticsRequests;
+    HashMap<uint64_t, RefPtr<DictionaryCallback> > m_dictionaryCallbacks;
+    HashMap<uint64_t, RefPtr<StatisticsRequest> > m_statisticsRequests;
 
 #if PLATFORM(MAC)
     bool m_processSuppressionEnabled;
diff --git a/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp b/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp
index b7986221d..4830cf0c6 100644
--- a/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp
+++ b/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp
@@ -116,7 +116,7 @@ void WebCookieManagerProxy::didGetHostnamesWithCookies(const Vector<String>& hos
     }
 
     size_t hostnameCount = hostnameList.size();
-    Vector<RefPtr<APIObject>> hostnames(hostnameCount);
+    Vector<RefPtr<APIObject> > hostnames(hostnameCount);
 
     for (size_t i = 0; i < hostnameCount; ++i)
         hostnames[i] = WebString::create(hostnameList[i]);
diff --git a/Source/WebKit2/UIProcess/WebCookieManagerProxy.h b/Source/WebKit2/UIProcess/WebCookieManagerProxy.h
index 215f22d69..ae3b5c265 100644
--- a/Source/WebKit2/UIProcess/WebCookieManagerProxy.h
+++ b/Source/WebKit2/UIProcess/WebCookieManagerProxy.h
@@ -98,8 +98,8 @@ private:
     void persistHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy);
 #endif
 
-    HashMap<uint64_t, RefPtr<ArrayCallback>> m_arrayCallbacks;
-    HashMap<uint64_t, RefPtr<HTTPCookieAcceptPolicyCallback>> m_httpCookieAcceptPolicyCallbacks;
+    HashMap<uint64_t, RefPtr<ArrayCallback> > m_arrayCallbacks;
+    HashMap<uint64_t, RefPtr<HTTPCookieAcceptPolicyCallback> > m_httpCookieAcceptPolicyCallbacks;
 
     WebCookieManagerProxyClient m_client;
 
diff --git a/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp b/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp
index 959cb5f24..c4febdc26 100644
--- a/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp
+++ b/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp
@@ -157,7 +157,7 @@ void WebDatabaseManagerProxy::didGetDatabasesByOrigin(const Vector<OriginAndData
     }
 
     size_t originAndDatabasesCount = originAndDatabasesVector.size();
-    Vector<RefPtr<APIObject>> result(originAndDatabasesCount);
+    Vector<RefPtr<APIObject> > result(originAndDatabasesCount);
 
     for (size_t i = 0; i < originAndDatabasesCount; ++i) {
         const OriginAndDatabases& originAndDatabases = originAndDatabasesVector[i];
@@ -165,11 +165,11 @@ void WebDatabaseManagerProxy::didGetDatabasesByOrigin(const Vector<OriginAndData
         RefPtr<APIObject> origin = WebSecurityOrigin::createFromDatabaseIdentifier(originAndDatabases.originIdentifier);
     
         size_t databasesCount = originAndDatabases.databases.size();
-        Vector<RefPtr<APIObject>> databases(databasesCount);
+        Vector<RefPtr<APIObject> > databases(databasesCount);
     
         for (size_t j = 0; j < databasesCount; ++j) {
             const DatabaseDetails& details = originAndDatabases.databases[i];
-            HashMap<String, RefPtr<APIObject>> detailsMap;
+            HashMap<String, RefPtr<APIObject> > detailsMap;
 
             detailsMap.set(databaseDetailsNameKey(), WebString::create(details.name()));
             detailsMap.set(databaseDetailsDisplayNameKey(), WebString::create(details.displayName()));
@@ -178,7 +178,7 @@ void WebDatabaseManagerProxy::didGetDatabasesByOrigin(const Vector<OriginAndData
             databases.append(ImmutableDictionary::adopt(detailsMap));
         }
 
-        HashMap<String, RefPtr<APIObject>> originAndDatabasesMap;
+        HashMap<String, RefPtr<APIObject> > originAndDatabasesMap;
         originAndDatabasesMap.set(originKey(), origin);
         originAndDatabasesMap.set(originQuotaKey(), WebUInt64::create(originAndDatabases.originQuota));
         originAndDatabasesMap.set(originUsageKey(), WebUInt64::create(originAndDatabases.originUsage));
@@ -209,7 +209,7 @@ void WebDatabaseManagerProxy::didGetDatabaseOrigins(const Vector<String>& origin
     }
 
     size_t originIdentifiersCount = originIdentifiers.size();
-    Vector<RefPtr<APIObject>> securityOrigins(originIdentifiersCount);
+    Vector<RefPtr<APIObject> > securityOrigins(originIdentifiersCount);
 
     for (size_t i = 0; i < originIdentifiersCount; ++i)
         securityOrigins[i] = WebSecurityOrigin::createFromDatabaseIdentifier(originIdentifiers[i]);
diff --git a/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h b/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h
index c8abbe400..3266d5849 100644
--- a/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h
+++ b/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h
@@ -93,7 +93,7 @@ private:
     void didModifyOrigin(const String& originIdentifier);
     void didModifyDatabase(const String& originIdentifier, const String& databaseIdentifier);
 
-    HashMap<uint64_t, RefPtr<ArrayCallback>> m_arrayCallbacks;
+    HashMap<uint64_t, RefPtr<ArrayCallback> > m_arrayCallbacks;
     WebDatabaseManagerProxyClient m_client;
 };
 
diff --git a/Source/WebKit2/UIProcess/WebFormClient.cpp b/Source/WebKit2/UIProcess/WebFormClient.cpp
index a17f61344..ecddbcc42 100644
--- a/Source/WebKit2/UIProcess/WebFormClient.cpp
+++ b/Source/WebKit2/UIProcess/WebFormClient.cpp
@@ -33,7 +33,7 @@
 
 namespace WebKit {
 
-bool WebFormClient::willSubmitForm(WebPageProxy* page, WebFrameProxy* frame, WebFrameProxy* sourceFrame, const Vector<std::pair<String, String>>& textFieldValues, APIObject* userData, WebFormSubmissionListenerProxy* listener)
+bool WebFormClient::willSubmitForm(WebPageProxy* page, WebFrameProxy* frame, WebFrameProxy* sourceFrame, const Vector<std::pair<String, String> >& textFieldValues, APIObject* userData, WebFormSubmissionListenerProxy* listener)
 {
     if (!m_client.willSubmitForm)
         return false;
diff --git a/Source/WebKit2/UIProcess/WebFormClient.h b/Source/WebKit2/UIProcess/WebFormClient.h
index ca0f2b4b6..05925239f 100644
--- a/Source/WebKit2/UIProcess/WebFormClient.h
+++ b/Source/WebKit2/UIProcess/WebFormClient.h
@@ -41,7 +41,7 @@ class WebFormSubmissionListenerProxy;
 
 class WebFormClient : public APIClient<WKPageFormClient, kWKPageFormClientCurrentVersion> {
 public:
-    bool willSubmitForm(WebPageProxy*, WebFrameProxy*, WebFrameProxy*, const Vector<std::pair<String, String>>& textFieldValues, APIObject* userData, WebFormSubmissionListenerProxy*); 
+    bool willSubmitForm(WebPageProxy*, WebFrameProxy*, WebFrameProxy*, const Vector<std::pair<String, String> >& textFieldValues, APIObject* userData, WebFormSubmissionListenerProxy*); 
 };
 
 } // namespace WebKit
diff --git a/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp b/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp
index 8507543c0..cb10ee0b2 100644
--- a/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp
+++ b/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp
@@ -65,11 +65,11 @@ void WebKeyValueStorageManager::derefWebContextSupplement()
     APIObject::deref();
 }
 
-static void didGetKeyValueStorageOrigins(const Vector<RefPtr<WebCore::SecurityOrigin>>& securityOrigins, void* context)
+static void didGetKeyValueStorageOrigins(const Vector<RefPtr<WebCore::SecurityOrigin> >& securityOrigins, void* context)
 {
     RefPtr<ArrayCallback> callback = adoptRef(static_cast<ArrayCallback*>(context));
 
-    Vector<RefPtr<APIObject>> webSecurityOrigins;
+    Vector<RefPtr<APIObject> > webSecurityOrigins;
     webSecurityOrigins.reserveInitialCapacity(securityOrigins.size());
 
     for (unsigned i = 0; i < securityOrigins.size(); ++i)
diff --git a/Source/WebKit2/UIProcess/WebLoaderClient.cpp b/Source/WebKit2/UIProcess/WebLoaderClient.cpp
index 82123f4d8..e1c587c13 100644
--- a/Source/WebKit2/UIProcess/WebLoaderClient.cpp
+++ b/Source/WebKit2/UIProcess/WebLoaderClient.cpp
@@ -246,7 +246,7 @@ void WebLoaderClient::processDidCrash(WebPageProxy* page)
     m_client.processDidCrash(toAPI(page), m_client.clientInfo);
 }
 
-void WebLoaderClient::didChangeBackForwardList(WebPageProxy* page, WebBackForwardListItem* addedItem, Vector<RefPtr<APIObject>>* removedItems)
+void WebLoaderClient::didChangeBackForwardList(WebPageProxy* page, WebBackForwardListItem* addedItem, Vector<RefPtr<APIObject> >* removedItems)
 {
     if (!m_client.didChangeBackForwardList)
         return;
diff --git a/Source/WebKit2/UIProcess/WebLoaderClient.h b/Source/WebKit2/UIProcess/WebLoaderClient.h
index ce5a31cb3..c3fe2b422 100644
--- a/Source/WebKit2/UIProcess/WebLoaderClient.h
+++ b/Source/WebKit2/UIProcess/WebLoaderClient.h
@@ -86,7 +86,7 @@ public:
     void processDidBecomeResponsive(WebPageProxy*);
     void processDidCrash(WebPageProxy*);
 
-    void didChangeBackForwardList(WebPageProxy*, WebBackForwardListItem* addedItem, Vector<RefPtr<APIObject>>* removedItems);
+    void didChangeBackForwardList(WebPageProxy*, WebBackForwardListItem* addedItem, Vector<RefPtr<APIObject> >* removedItems);
     bool shouldGoToBackForwardListItem(WebPageProxy*, WebBackForwardListItem*);
     void willGoToBackForwardListItem(WebPageProxy*, WebBackForwardListItem*, APIObject*);
 
diff --git a/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp b/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp
index b8d6ffd8f..425dc91e8 100644
--- a/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp
+++ b/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp
@@ -99,7 +99,7 @@ void WebMediaCacheManagerProxy::didGetHostnamesWithMediaCache(const Vector<Strin
     }
 
     size_t hostnameCount = hostnameList.size();
-    Vector<RefPtr<APIObject>> hostnames(hostnameCount);
+    Vector<RefPtr<APIObject> > hostnames(hostnameCount);
 
     for (size_t i = 0; i < hostnameCount; ++i)
         hostnames[i] = WebString::create(hostnameList[i]);
diff --git a/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.h b/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.h
index 5d557879e..5c10b24f0 100644
--- a/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.h
+++ b/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.h
@@ -71,7 +71,7 @@ private:
     // CoreIPC::MessageReceiver
     virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
 
-    HashMap<uint64_t, RefPtr<ArrayCallback>> m_arrayCallbacks;
+    HashMap<uint64_t, RefPtr<ArrayCallback> > m_arrayCallbacks;
 };
 
 } // namespace WebKit
diff --git a/Source/WebKit2/UIProcess/WebPageContextMenuClient.cpp b/Source/WebKit2/UIProcess/WebPageContextMenuClient.cpp
index f81df3a57..96275760c 100644
--- a/Source/WebKit2/UIProcess/WebPageContextMenuClient.cpp
+++ b/Source/WebKit2/UIProcess/WebPageContextMenuClient.cpp
@@ -100,7 +100,7 @@ bool WebPageContextMenuClient::showContextMenu(WebPageProxy* page, const WebCore
 
     unsigned size = menuItemsVector.size();
 
-    Vector<RefPtr<APIObject>> menuItems;
+    Vector<RefPtr<APIObject> > menuItems;
     menuItems.reserveCapacity(size);
 
     for (unsigned i = 0; i < size; ++i)
diff --git a/Source/WebKit2/UIProcess/WebPageProxy.cpp b/Source/WebKit2/UIProcess/WebPageProxy.cpp
index 737d71356..765a7cee1 100644
--- a/Source/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/Source/WebKit2/UIProcess/WebPageProxy.cpp
@@ -164,7 +164,7 @@ private:
     ExceededDatabaseQuotaRecords() { }
     ~ExceededDatabaseQuotaRecords() { }
 
-    Deque<OwnPtr<Record>> m_records;
+    Deque<OwnPtr<Record> > m_records;
     OwnPtr<Record> m_currentRecord;
 };
 
@@ -395,7 +395,7 @@ PassRefPtr<ImmutableArray> WebPageProxy::relatedPages() const
     // pages() returns a list of pages in WebProcess, so this page may or may not be among them - a client can use a reference to WebPageProxy after the page has closed.
     Vector<WebPageProxy*> pages = m_process->pages();
 
-    Vector<RefPtr<APIObject>> result;
+    Vector<RefPtr<APIObject> > result;
     result.reserveCapacity(pages.size());
     for (size_t i = 0; i < pages.size(); ++i) {
         if (pages[i] != this)
@@ -888,7 +888,7 @@ void WebPageProxy::tryRestoreScrollPosition()
     m_process->send(Messages::WebPage::TryRestoreScrollPosition(), m_pageID);
 }
 
-void WebPageProxy::didChangeBackForwardList(WebBackForwardListItem* added, Vector<RefPtr<APIObject>>* removed)
+void WebPageProxy::didChangeBackForwardList(WebBackForwardListItem* added, Vector<RefPtr<APIObject> >* removed)
 {
     m_loaderClient.didChangeBackForwardList(this, added, removed);
 }
@@ -1362,7 +1362,7 @@ void WebPageProxy::handleWheelEvent(const NativeWebWheelEvent& event)
         return;
     }
 
-    OwnPtr<Vector<NativeWebWheelEvent>> coalescedWheelEvent = adoptPtr(new Vector<NativeWebWheelEvent>);
+    OwnPtr<Vector<NativeWebWheelEvent> > coalescedWheelEvent = adoptPtr(new Vector<NativeWebWheelEvent>);
     coalescedWheelEvent->append(event);
     m_currentlyProcessedWheelEvents.append(coalescedWheelEvent.release());
     sendWheelEvent(event);
@@ -1370,7 +1370,7 @@ void WebPageProxy::handleWheelEvent(const NativeWebWheelEvent& event)
 
 void WebPageProxy::processNextQueuedWheelEvent()
 {
-    OwnPtr<Vector<NativeWebWheelEvent>> nextCoalescedEvent = adoptPtr(new Vector<NativeWebWheelEvent>);
+    OwnPtr<Vector<NativeWebWheelEvent> > nextCoalescedEvent = adoptPtr(new Vector<NativeWebWheelEvent>);
     WebWheelEvent nextWheelEvent = coalescedWheelEvent(m_wheelEventQueue, *nextCoalescedEvent.get());
     m_currentlyProcessedWheelEvents.append(nextCoalescedEvent.release());
     sendWheelEvent(nextWheelEvent);
@@ -1925,7 +1925,7 @@ void WebPageProxy::setMemoryCacheClientCallsEnabled(bool memoryCacheClientCallsE
 void WebPageProxy::findStringMatches(const String& string, FindOptions options, unsigned maxMatchCount)
 {
     if (string.isEmpty()) {
-        didFindStringMatches(string, Vector<Vector<WebCore::IntRect>> (), 0);
+        didFindStringMatches(string, Vector<Vector<WebCore::IntRect> > (), 0);
         return;
     }
 
@@ -2578,7 +2578,7 @@ void WebPageProxy::unableToImplementPolicy(uint64_t frameID, const ResourceError
 
 // FormClient
 
-void WebPageProxy::willSubmitForm(uint64_t frameID, uint64_t sourceFrameID, const Vector<std::pair<String, String>>& textFieldValues, uint64_t listenerID, CoreIPC::MessageDecoder& decoder)
+void WebPageProxy::willSubmitForm(uint64_t frameID, uint64_t sourceFrameID, const Vector<std::pair<String, String> >& textFieldValues, uint64_t listenerID, CoreIPC::MessageDecoder& decoder)
 {
     RefPtr<APIObject> userData;
     WebContextUserMessageDecoder messageDecoder(userData, m_process.get());
@@ -3114,15 +3114,15 @@ void WebPageProxy::didFindString(const String& string, uint32_t matchCount)
     m_findClient.didFindString(this, string, matchCount);
 }
 
-void WebPageProxy::didFindStringMatches(const String& string, Vector<Vector<WebCore::IntRect>> matchRects, int32_t firstIndexAfterSelection)
+void WebPageProxy::didFindStringMatches(const String& string, Vector<Vector<WebCore::IntRect> > matchRects, int32_t firstIndexAfterSelection)
 {
-    Vector<RefPtr<APIObject>> matches;
+    Vector<RefPtr<APIObject> > matches;
     matches.reserveInitialCapacity(matchRects.size());
 
     for (size_t i = 0; i < matchRects.size(); ++i) {
         const Vector<WebCore::IntRect>& rects = matchRects[i];
         size_t numRects = matchRects[i].size();
-        Vector<RefPtr<APIObject>> apiRects;
+        Vector<RefPtr<APIObject> > apiRects;
         apiRects.reserveInitialCapacity(numRects);
 
         for (size_t i = 0; i < numRects; ++i)
@@ -3576,7 +3576,7 @@ void WebPageProxy::didReceiveEvent(uint32_t opaqueType, bool handled)
     case WebEvent::Wheel: {
         ASSERT(!m_currentlyProcessedWheelEvents.isEmpty());
 
-        OwnPtr<Vector<NativeWebWheelEvent>> oldestCoalescedEvent = m_currentlyProcessedWheelEvents.takeFirst();
+        OwnPtr<Vector<NativeWebWheelEvent> > oldestCoalescedEvent = m_currentlyProcessedWheelEvents.takeFirst();
 
         // FIXME: Dispatch additional events to the didNotHandleWheelEvent client function.
         if (!handled && m_uiClient.implementsDidNotHandleWheelEvent())
diff --git a/Source/WebKit2/UIProcess/WebPageProxy.h b/Source/WebKit2/UIProcess/WebPageProxy.h
index 64aa05116..80d1d28fd 100644
--- a/Source/WebKit2/UIProcess/WebPageProxy.h
+++ b/Source/WebKit2/UIProcess/WebPageProxy.h
@@ -301,7 +301,7 @@ public:
 
     void goToBackForwardItem(WebBackForwardListItem*);
     void tryRestoreScrollPosition();
-    void didChangeBackForwardList(WebBackForwardListItem* addedItem, Vector<RefPtr<APIObject>>* removedItems);
+    void didChangeBackForwardList(WebBackForwardListItem* addedItem, Vector<RefPtr<APIObject> >* removedItems);
     void shouldGoToBackForwardListItem(uint64_t itemID, bool& shouldGoToBackForwardListItem);
     void willGoToBackForwardListItem(uint64_t itemID, CoreIPC::MessageDecoder&);
 
@@ -555,7 +555,7 @@ public:
     void setFindIndicator(const WebCore::FloatRect& selectionRectInWindowCoordinates, const Vector<WebCore::FloatRect>& textRectsInSelectionRectCoordinates, float contentImageScaleFactor, const ShareableBitmap::Handle& contentImageHandle, bool fadeOut, bool animate);
     void didFindString(const String&, uint32_t matchCount);
     void didFailToFindString(const String&);
-    void didFindStringMatches(const String&, Vector<Vector<WebCore::IntRect>> matchRects, int32_t firstIndexAfterSelection);
+    void didFindStringMatches(const String&, Vector<Vector<WebCore::IntRect> > matchRects, int32_t firstIndexAfterSelection);
 
     void getContentsAsString(PassRefPtr<StringCallback>);
 #if ENABLE(MHTML)
@@ -828,7 +828,7 @@ private:
     void decidePolicyForResponseSync(uint64_t frameID, const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, uint64_t listenerID, CoreIPC::MessageDecoder&, bool& receivedPolicyAction, uint64_t& policyAction, uint64_t& downloadID);
     void unableToImplementPolicy(uint64_t frameID, const WebCore::ResourceError&, CoreIPC::MessageDecoder&);
 
-    void willSubmitForm(uint64_t frameID, uint64_t sourceFrameID, const Vector<std::pair<String, String>>& textFieldValues, uint64_t listenerID, CoreIPC::MessageDecoder&);
+    void willSubmitForm(uint64_t frameID, uint64_t sourceFrameID, const Vector<std::pair<String, String> >& textFieldValues, uint64_t listenerID, CoreIPC::MessageDecoder&);
 
     // UI client
     void createNewPage(const WebCore::ResourceRequest&, const WebCore::WindowFeatures&, uint32_t modifiers, int32_t mouseButton, uint64_t& newPageID, WebPageCreationParameters&);
@@ -1088,16 +1088,16 @@ private:
     RefPtr<WebVibrationProxy> m_vibration;
 #endif
 
-    HashMap<uint64_t, RefPtr<VoidCallback>> m_voidCallbacks;
-    HashMap<uint64_t, RefPtr<DataCallback>> m_dataCallbacks;
-    HashMap<uint64_t, RefPtr<ImageCallback>> m_imageCallbacks;
-    HashMap<uint64_t, RefPtr<StringCallback>> m_stringCallbacks;
+    HashMap<uint64_t, RefPtr<VoidCallback> > m_voidCallbacks;
+    HashMap<uint64_t, RefPtr<DataCallback> > m_dataCallbacks;
+    HashMap<uint64_t, RefPtr<ImageCallback> > m_imageCallbacks;
+    HashMap<uint64_t, RefPtr<StringCallback> > m_stringCallbacks;
     HashSet<uint64_t> m_loadDependentStringCallbackIDs;
-    HashMap<uint64_t, RefPtr<ScriptValueCallback>> m_scriptValueCallbacks;
-    HashMap<uint64_t, RefPtr<ComputedPagesCallback>> m_computedPagesCallbacks;
-    HashMap<uint64_t, RefPtr<ValidateCommandCallback>> m_validateCommandCallbacks;
+    HashMap<uint64_t, RefPtr<ScriptValueCallback> > m_scriptValueCallbacks;
+    HashMap<uint64_t, RefPtr<ComputedPagesCallback> > m_computedPagesCallbacks;
+    HashMap<uint64_t, RefPtr<ValidateCommandCallback> > m_validateCommandCallbacks;
 #if PLATFORM(GTK)
-    HashMap<uint64_t, RefPtr<PrintFinishedCallback>> m_printFinishedCallbacks;
+    HashMap<uint64_t, RefPtr<PrintFinishedCallback> > m_printFinishedCallbacks;
 #endif
 
     HashSet<WebEditCommandProxy*> m_editCommandSet;
@@ -1188,7 +1188,7 @@ private:
 #endif
     Deque<NativeWebKeyboardEvent> m_keyEventQueue;
     Deque<NativeWebWheelEvent> m_wheelEventQueue;
-    Deque<OwnPtr<Vector<NativeWebWheelEvent>>> m_currentlyProcessedWheelEvents;
+    Deque<OwnPtr<Vector<NativeWebWheelEvent> > > m_currentlyProcessedWheelEvents;
 
     bool m_processingMouseMoveEvent;
     OwnPtr<NativeWebMouseEvent> m_nextMouseMoveEvent;
@@ -1268,7 +1268,7 @@ private:
 #endif
 
 #if PLATFORM(QT)
-    WTF::HashSet<RefPtr<QtRefCountedNetworkRequestData>> m_applicationSchemeRequests;
+    WTF::HashSet<RefPtr<QtRefCountedNetworkRequestData> > m_applicationSchemeRequests;
 #endif
 
 #if ENABLE(PAGE_VISIBILITY_API)
diff --git a/Source/WebKit2/UIProcess/WebPageProxy.messages.in b/Source/WebKit2/UIProcess/WebPageProxy.messages.in
index 667bfa2c8..20e9f624e 100644
--- a/Source/WebKit2/UIProcess/WebPageProxy.messages.in
+++ b/Source/WebKit2/UIProcess/WebPageProxy.messages.in
@@ -141,7 +141,7 @@ messages -> WebPageProxy {
 #endif
 
     # Forms messages
-    WillSubmitForm(uint64_t frameID, uint64_t sourceFrameID, WTF::Vector<std::pair<WTF::String, WTF::String>> textFieldValues, uint64_t listenerID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
+    WillSubmitForm(uint64_t frameID, uint64_t sourceFrameID, WTF::Vector<std::pair<WTF::String, WTF::String> > textFieldValues, uint64_t listenerID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
 
     # Callback messages
     VoidCallback(uint64_t callbackID)
@@ -194,7 +194,7 @@ messages -> WebPageProxy {
     SetFindIndicator(WebCore::FloatRect selectionRect, Vector<WebCore::FloatRect> textRects, float contentImageScaleFactor, WebKit::ShareableBitmap::Handle contentImageHandle, bool fadeOut, bool animate)
     DidFindString(WTF::String string, uint32_t matchCount)
     DidFailToFindString(WTF::String string)
-    DidFindStringMatches(WTF::String string, Vector<Vector<WebCore::IntRect>> matches, int32_t firstIndexAfterSelection)
+    DidFindStringMatches(WTF::String string, Vector<Vector<WebCore::IntRect> > matches, int32_t firstIndexAfterSelection)
     DidGetImageForFindMatch(WebKit::ShareableBitmap::Handle contentImageHandle, uint32_t matchIndex)
 
     # PopupMenu messages
diff --git a/Source/WebKit2/UIProcess/WebProcessProxy.cpp b/Source/WebKit2/UIProcess/WebProcessProxy.cpp
index 88659844a..5090abd97 100644
--- a/Source/WebKit2/UIProcess/WebProcessProxy.cpp
+++ b/Source/WebKit2/UIProcess/WebProcessProxy.cpp
@@ -148,7 +148,7 @@ void WebProcessProxy::disconnect()
 
     m_responsivenessTimer.invalidate();
 
-    Vector<RefPtr<WebFrameProxy>> frames;
+    Vector<RefPtr<WebFrameProxy> > frames;
     copyValuesToVector(m_frameMap, frames);
 
     for (size_t i = 0, size = frames.size(); i < size; ++i)
@@ -404,7 +404,7 @@ void WebProcessProxy::didClose(CoreIPC::Connection*)
 
     webConnection()->didClose();
 
-    Vector<RefPtr<WebPageProxy>> pages;
+    Vector<RefPtr<WebPageProxy> > pages;
     copyValuesToVector(m_pageMap, pages);
 
     disconnect();
@@ -430,7 +430,7 @@ void WebProcessProxy::didReceiveInvalidMessage(CoreIPC::Connection* connection,
 
 void WebProcessProxy::didBecomeUnresponsive(ResponsivenessTimer*)
 {
-    Vector<RefPtr<WebPageProxy>> pages;
+    Vector<RefPtr<WebPageProxy> > pages;
     copyValuesToVector(m_pageMap, pages);
     for (size_t i = 0, size = pages.size(); i < size; ++i)
         pages[i]->processDidBecomeUnresponsive();
@@ -438,7 +438,7 @@ void WebProcessProxy::didBecomeUnresponsive(ResponsivenessTimer*)
 
 void WebProcessProxy::interactionOccurredWhileUnresponsive(ResponsivenessTimer*)
 {
-    Vector<RefPtr<WebPageProxy>> pages;
+    Vector<RefPtr<WebPageProxy> > pages;
     copyValuesToVector(m_pageMap, pages);
     for (size_t i = 0, size = pages.size(); i < size; ++i)
         pages[i]->interactionOccurredWhileProcessUnresponsive();
@@ -446,7 +446,7 @@ void WebProcessProxy::interactionOccurredWhileUnresponsive(ResponsivenessTimer*)
 
 void WebProcessProxy::didBecomeResponsive(ResponsivenessTimer*)
 {
-    Vector<RefPtr<WebPageProxy>> pages;
+    Vector<RefPtr<WebPageProxy> > pages;
     copyValuesToVector(m_pageMap, pages);
     for (size_t i = 0, size = pages.size(); i < size; ++i)
         pages[i]->processDidBecomeResponsive();
@@ -495,7 +495,7 @@ void WebProcessProxy::didDestroyFrame(uint64_t frameID)
 
 void WebProcessProxy::disconnectFramesFromPage(WebPageProxy* page)
 {
-    Vector<RefPtr<WebFrameProxy>> frames;
+    Vector<RefPtr<WebFrameProxy> > frames;
     copyValuesToVector(m_frameMap, frames);
     for (size_t i = 0, size = frames.size(); i < size; ++i) {
         if (frames[i]->page() == page)
@@ -506,7 +506,7 @@ void WebProcessProxy::disconnectFramesFromPage(WebPageProxy* page)
 size_t WebProcessProxy::frameCountInPage(WebPageProxy* page) const
 {
     size_t result = 0;
-    for (HashMap<uint64_t, RefPtr<WebFrameProxy>>::const_iterator iter = m_frameMap.begin(); iter != m_frameMap.end(); ++iter) {
+    for (HashMap<uint64_t, RefPtr<WebFrameProxy> >::const_iterator iter = m_frameMap.begin(); iter != m_frameMap.end(); ++iter) {
         if (iter->value->page() == page)
             ++result;
     }
diff --git a/Source/WebKit2/UIProcess/WebProcessProxy.h b/Source/WebKit2/UIProcess/WebProcessProxy.h
index 7d9b7f6ba..a22f4723f 100644
--- a/Source/WebKit2/UIProcess/WebProcessProxy.h
+++ b/Source/WebKit2/UIProcess/WebProcessProxy.h
@@ -60,8 +60,8 @@ struct WebNavigationDataStore;
 
 class WebProcessProxy : public ChildProcessProxy, ResponsivenessTimer::Client {
 public:
-    typedef HashMap<uint64_t, RefPtr<WebBackForwardListItem>> WebBackForwardListItemMap;
-    typedef HashMap<uint64_t, RefPtr<WebFrameProxy>> WebFrameProxyMap;
+    typedef HashMap<uint64_t, RefPtr<WebBackForwardListItem> > WebBackForwardListItemMap;
+    typedef HashMap<uint64_t, RefPtr<WebFrameProxy> > WebFrameProxyMap;
     typedef HashMap<uint64_t, WebPageProxy*> WebPageProxyMap;
 
     static PassRefPtr<WebProcessProxy> create(PassRefPtr<WebContext>);
diff --git a/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.h b/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.h
index e80afc3c6..3b5a3b2d9 100644
--- a/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.h
+++ b/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.h
@@ -74,7 +74,7 @@ private:
     // Message handlers.
     void didGetCacheOrigins(const Vector<SecurityOriginData>& originIdentifiers, uint64_t callbackID);
 
-    HashMap<uint64_t, RefPtr<ArrayCallback>> m_arrayCallbacks;
+    HashMap<uint64_t, RefPtr<ArrayCallback> > m_arrayCallbacks;
 };
 
 } // namespace WebKit