From dcc8cf2e65d1aa555cce12431a16547e66b469ee Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Tue, 27 Apr 2010 16:31:00 +0100
Subject: Merge webkit.org at r58033 : Initial merge by git

Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
---
 WebCore/platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'WebCore/platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp')

diff --git a/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp b/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp
index 7b57db1..d846af7 100644
--- a/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp
+++ b/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp
@@ -142,12 +142,6 @@ namespace WebCore {
 
 void SQLiteFileSystem::registerSQLiteVFS()
 {
-    // FIXME: Make sure there aren't any unintended consequences when VFS code is called in the browser process.
-    if (!ChromiumBridge::sandboxEnabled()) {
-        ASSERT_NOT_REACHED();
-        return;
-    }
-
     sqlite3_vfs* win32_vfs = sqlite3_vfs_find("win32");
     static sqlite3_vfs chromium_vfs = {
         1,
-- 
cgit v1.1