Use the same sqlite header configuration in all of webdatabase

Some of third_party/WebKit/Source/webdatabase uses sqlite withq
internals exposed and some uses it with internals not exposed. That
mismatch causes issues in jumbo builds since it compiles several files
together and need headers to say the same thing.

This changes webdatabase so that it all compile with the
CHROMIUM_SQLITE_INTERNALS define set.

R=michaeln@chromium.org

Bug: 740542
Change-Id: I0b5c66fde7d191afd7a7143ef32c9c6f1b21b9e2
Reviewed-on: https://chromium-review.googlesource.com/565502Reviewed-by: Michael Nordman <michaeln@chromium.org>
Commit-Queue: bratell at Opera <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#485558}

third_party/WebKit/Source/modules/webdatabase/BUILD.gn

@@ -80,4 +80,7 @@ blink_modules_sources("webdatabase") {
   } else if (is_posix) {
     sources += [ "sqlite/SQLiteFileSystemPosix.cpp" ]
   }
+
+  # Expose chromium_sqlite3_* functions from Chromium's patched SQLite.
+  defines = [ "CHROMIUM_SQLITE_INTERNALS" ]  # So that sqlite3.h is not included without this set.
 }

third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteDatabase.cpp

@@ -47,11 +47,14 @@ SQLiteDatabase::SQLiteDatabase()
     : db_(0),
       page_size_(-1),
       transaction_in_progress_(false),
+#if DCHECK_IS_ON()
       sharable_(false),
+#endif
       opening_thread_(0),
       open_error_(SQLITE_ERROR),
       open_error_message_(),
-      last_changes_count_(0) {}
+      last_changes_count_(0) {
+}
 
 SQLiteDatabase::~SQLiteDatabase() {
   Close();

third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteDatabase.h

@@ -96,7 +96,9 @@ class SQLiteDatabase {
   const char* LastErrorMsg();
 
   sqlite3* Sqlite3Handle() const {
+#if DCHECK_IS_ON()
     DCHECK_EQ(sharable_ || CurrentThread(), opening_thread_ || !db_);
+#endif
     return db_;
   }
 
@@ -138,7 +140,9 @@ class SQLiteDatabase {
   int page_size_;
 
   bool transaction_in_progress_;
+#if DCHECK_IS_ON()
   bool sharable_;
+#endif
 
   Mutex authorizer_lock_;
   CrossThreadPersistent<DatabaseAuthorizer> authorizer_;

third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystemPosix.cpp

@@ -28,9 +28,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// Expose chromium_sqlite3_* functions from Chromium's patched SQLite.
-#define CHROMIUM_SQLITE_INTERNALS
-
 #include "modules/webdatabase/sqlite/SQLiteFileSystem.h"
 
 #include "public/platform/Platform.h"

third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystemWin.cpp

@@ -28,9 +28,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// Expose chromium_sqlite3_* functions from Chromium's patched SQLite.
-#define CHROMIUM_SQLITE_INTERNALS
-
 #include "modules/webdatabase/sqlite/SQLiteFileSystem.h"
 
 #include <windows.h>