Call sqlite3Preload() only when not using system sqlite. Modify the

sqlite3.h header to not include a stub definition of sqlite3Preload().

BUG=None
TEST=None
Review URL: http://codereview.chromium.org/6356012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72637 0039d316-1c4b-4281-b951-d872f2087c98

app/sql/connection.cc

@@ -130,7 +130,11 @@ void Connection::Preload() {
   if (!dummy || !dummy.Step())
     return;
 
+#if !defined(USE_SYSTEM_SQLITE)
+  // This function is only defined in Chromium's version of sqlite.
+  // Do not call it when using system sqlite.
   sqlite3Preload(db_);
+#endif
 }
 
 bool Connection::BeginTransaction() {

third_party/sqlite/sqlite3.h

@@ -11,10 +11,6 @@
 
 #if defined(USE_SYSTEM_SQLITE)
 #include <sqlite3.h>
-
-// A no-op implementation of database preloading (not available
-// when using system sqlite).
-static int sqlite3Preload(sqlite3 *db) { return SQLITE_OK; }
 #else
 #include "third_party/sqlite/preprocessed/sqlite3.h"
 #endif