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

app/sql/connection.cc

 // 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 "app/sql/connection.h"
 
 #include <string.h>
 
 #include "app/sql/statement.h"
 #include "base/file_path.h"
@@ skipping 112 matching lines @@
 
   // A statement must be open for the preload command to work. If the meta
   // table doesn't exist, it probably means this is a new database and there
   // is nothing to preload (so it's OK we do nothing).
   if (!DoesTableExist("meta"))
     return;
   Statement dummy(GetUniqueStatement("SELECT * FROM meta"));
   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() {
   if (needs_rollback_) {
     DCHECK(transaction_nesting_ > 0);
 
     // When we're going to rollback, fail on this begin and don't actually
     // mark us as entering the nested transaction.
     return false;
   }
@@ skipping 262 matching lines @@
 
 int Connection::OnSqliteError(int err, sql::Statement *stmt) {
   if (error_delegate_.get())
     return error_delegate_->OnError(err, this, stmt);
   // The default handling is to assert on debug and to ignore on release.
   NOTREACHED() << GetErrorMessage();
   return err;
 }
 
 }  // namespace sql