Update Android to reflect recent upstreaming of V8 runtime feature default values
See http://trac.webkit.org/changeset/55020
Change-Id: I4d6c067dcafc43d2798c55e042e446d4964b326f
diff --git a/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp b/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
index 0fae4ff..1b09518 100644
--- a/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
+++ b/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
@@ -41,11 +41,8 @@
bool RuntimeEnabledFeatures::isLocalStorageEnabled = true;
bool RuntimeEnabledFeatures::isSessionStorageEnabled = true;
bool RuntimeEnabledFeatures::isWebkitNotificationsEnabled = false;
-#if PLATFORM(ANDROID)
-// These should default to true, to match the behavior with JSC
bool RuntimeEnabledFeatures::isApplicationCacheEnabled = true;
bool RuntimeEnabledFeatures::isGeolocationEnabled = true;
-#endif
bool RuntimeEnabledFeatures::isIndexedDBEnabled = false;
#if ENABLE(VIDEO)
diff --git a/WebCore/storage/Database.cpp b/WebCore/storage/Database.cpp
index 619c3ce..2130631 100644
--- a/WebCore/storage/Database.cpp
+++ b/WebCore/storage/Database.cpp
@@ -73,8 +73,6 @@
#if ENABLE(DATABASE)
-// ANDROID
-// This should default to true, to match the behavior with JSC
static bool isDatabaseAvailable = true;
void Database::setIsAvailable(bool available)
