9 files changed, 8 insertions, 63 deletions
diff --git a/chrome/browser/renderer_host/database_dispatcher_host.cc b/chrome/browser/renderer_host/database_dispatcher_host.cc
index 8973881..b4f0d5e 100644
--- a/chrome/browser/renderer_host/database_dispatcher_host.cc
+++ b/chrome/browser/renderer_host/database_dispatcher_host.cc
@@ -8,12 +8,6 @@
 #include "base/file_descriptor_posix.h"
 #endif
 
-#if defined(USE_SYSTEM_SQLITE)
-#include <sqlite3.h>
-#else
-#include "third_party/sqlite/preprocessed/sqlite3.h"
-#endif
-
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "chrome/browser/browser_process.h"
@@ -24,6 +18,7 @@
 #include "chrome/browser/renderer_host/database_permission_request.h"
 #include "chrome/common/render_messages.h"
 #include "googleurl/src/gurl.h"
+#include "third_party/sqlite/preprocessed/sqlite3.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "webkit/database/database_util.h"
 #include "webkit/database/vfs_backend.h"
diff --git a/chrome/common/database_util.cc b/chrome/common/database_util.cc
index 7af72c0..c62e5fa 100644
--- a/chrome/common/database_util.cc
+++ b/chrome/common/database_util.cc
@@ -4,15 +4,10 @@
 
 #include "chrome/common/database_util.h"
 
-#if defined(USE_SYSTEM_SQLITE)
-#include <sqlite3.h>
-#else
-#include "third_party/sqlite/preprocessed/sqlite3.h"
-#endif
-
 #include "chrome/common/child_thread.h"
 #include "chrome/common/render_messages.h"
 #include "ipc/ipc_sync_message_filter.h"
+#include "third_party/sqlite/preprocessed/sqlite3.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 
 using WebKit::WebKitClient;
diff --git a/chrome/common/sqlite_compiled_statement.cc b/chrome/common/sqlite_compiled_statement.cc
index 93b0d67..f54182a 100644
--- a/chrome/common/sqlite_compiled_statement.cc
+++ b/chrome/common/sqlite_compiled_statement.cc
@@ -1,18 +1,13 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/sqlite_compiled_statement.h"
 
-#if defined(USE_SYSTEM_SQLITE)
-#include <sqlite3.h>
-#else
-#include "third_party/sqlite/preprocessed/sqlite3.h"
-#endif
-
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "chrome/common/sqlite_utils.h"
+#include "third_party/sqlite/preprocessed/sqlite3.h"
 
 // SqliteStatementCache -------------------------------------------------------
 
diff --git a/chrome/common/sqlite_utils.cc b/chrome/common/sqlite_utils.cc
index b99b8f2..ed383be 100644
--- a/chrome/common/sqlite_utils.cc
+++ b/chrome/common/sqlite_utils.cc
@@ -506,11 +506,3 @@ std::wstring SQLStatement::column_wstring(int index) {
   column_wstring(index, &wstr);
   return wstr;
 }
-
-#if defined(USE_SYSTEM_SQLITE)
-// This function is a local change to sqlite3 which doesn't exist when one is
-// using the system sqlite library. Thus, we stub it out here.
-int sqlite3Preload(sqlite3* db) {
-  return 0;
-}
-#endif
diff --git a/chrome/common/sqlite_utils.h b/chrome/common/sqlite_utils.h
index 7ae6572..f7351a2 100644
--- a/chrome/common/sqlite_utils.h
+++ b/chrome/common/sqlite_utils.h
@@ -8,16 +8,11 @@
 #include <string>
 #include <vector>
 
-#if defined(USE_SYSTEM_SQLITE)
-#include <sqlite3.h>
-#else
-#include "third_party/sqlite/preprocessed/sqlite3.h"
-#endif
-
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
+#include "third_party/sqlite/preprocessed/sqlite3.h"
 
 // forward declarations of classes defined here
 class FilePath;
@@ -401,10 +396,4 @@ bool DoesSqliteTableHaveRow(sqlite3* db, const char* table_name);
 
 }  // namespace sqlite_utils
 
-#if defined(USE_SYSTEM_SQLITE)
-// This function is a local change to sqlite3 which doesn't exist when one is
-// using the system sqlite library. Thus, we stub it out here.
-int sqlite3Preload(sqlite3* db);
-#endif
-
 #endif  // CHROME_COMMON_SQLITE_UTILS_H_
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index 3573488..f63a90e 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -9,12 +9,6 @@
 #include <map>
 #include <vector>
 
-#if defined(USE_SYSTEM_SQLITE)
-#include <sqlite3.h>
-#else
-#include "third_party/sqlite/preprocessed/sqlite3.h"
-#endif
-
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ -64,6 +58,7 @@
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_platform_file.h"
 #include "net/base/net_util.h"
+#include "third_party/sqlite/preprocessed/sqlite3.h"
 #include "third_party/tcmalloc/chromium/src/google/malloc_extension.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCache.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebColor.h"
diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc
index 27329ee..8537d65 100644
--- a/chrome/renderer/renderer_webkitclient_impl.cc
+++ b/chrome/renderer/renderer_webkitclient_impl.cc
@@ -4,12 +4,6 @@
 
 #include "chrome/renderer/renderer_webkitclient_impl.h"
 
-#if defined(USE_SYSTEM_SQLITE)
-#include <sqlite3.h>
-#else
-#include "third_party/sqlite/preprocessed/sqlite3.h"
-#endif
-
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/platform_file.h"
diff --git a/webkit/database/vfs_backend.cc b/webkit/database/vfs_backend.cc
index 94cec80..b828039 100644
--- a/webkit/database/vfs_backend.cc
+++ b/webkit/database/vfs_backend.cc
@@ -4,15 +4,10 @@
 
 #include "webkit/database/vfs_backend.h"
 
-#if defined(USE_SYSTEM_SQLITE)
-#include <sqlite3.h>
-#else
-#include "third_party/sqlite/preprocessed/sqlite3.h"
-#endif
-
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
+#include "third_party/sqlite/preprocessed/sqlite3.h"
 
 namespace webkit_database {
 
diff --git a/webkit/tools/test_shell/simple_database_system.cc b/webkit/tools/test_shell/simple_database_system.cc
index dd0326c..16e280f 100644
--- a/webkit/tools/test_shell/simple_database_system.cc
+++ b/webkit/tools/test_shell/simple_database_system.cc
@@ -4,15 +4,10 @@
 
 #include "webkit/tools/test_shell/simple_database_system.h"
 
-#if defined(USE_SYSTEM_SQLITE)
-#include <sqlite3.h>
-#else
-#include "third_party/sqlite/preprocessed/sqlite3.h"
-#endif
-
 #include "base/auto_reset.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
+#include "third_party/sqlite/preprocessed/sqlite3.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDatabase.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 #include "webkit/database/database_util.h"