namespace WebCore {
-<<<<<<< HEAD
-#if PLATFORM(ANDROID)
-// This should default to true, to match the behavior with JSC
-bool RuntimeEnabledFeatures::isDatabaseEnabled = true;
-#endif
bool RuntimeEnabledFeatures::isLocalStorageEnabled = true;
bool RuntimeEnabledFeatures::isSessionStorageEnabled = true;
+bool RuntimeEnabledFeatures::isNotificationsEnabled = false;
#if PLATFORM(ANDROID)
// These should default to true, to match the behavior with JSC
-bool RuntimeEnabledFeatures::isNotificationsEnabled = true;
bool RuntimeEnabledFeatures::isApplicationCacheEnabled = true;
+bool RuntimeEnabledFeatures::isGeolocationEnabled = true;
#endif
-=======
-bool RuntimeEnabledFeatures::isLocalStorageEnabled = true;
-bool RuntimeEnabledFeatures::isSessionStorageEnabled = true;
-bool RuntimeEnabledFeatures::isNotificationsEnabled = false;
-bool RuntimeEnabledFeatures::isApplicationCacheEnabled = false;
-bool RuntimeEnabledFeatures::isGeolocationEnabled = false;
bool RuntimeEnabledFeatures::isIndexedDatabaseEnabled = false;
->>>>>>> webkit.org at r54127
} // namespace WebCore
#if ENABLE(DATABASE)
-static bool isDatabaseAvailable = false;
+#if PLATFORM(ANDROID)
+// This should default to true, to match the behavior with JSC
+static bool isDatabaseAvailable = true;
+#endif
void Database::setIsAvailable(bool available)
{