BASELINE: Update chromium to 44.0.2403.47

Change-Id: Ie056fedba95cf5e5c76b30c4b2c80fca4764aa2f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

4 files changed, 29 insertions, 11 deletions

diff --git a/chromium/third_party/sqlite/src/ext/fts1/ft_hash.h b/chromium/third_party/sqlite/src/ext/fts1/ft_hash.h
index 93b6dcfb48e..95871a4590c 100644
--- a/chromium/third_party/sqlite/src/ext/fts1/ft_hash.h
+++ b/chromium/third_party/sqlite/src/ext/fts1/ft_hash.h
@@ -9,7 +9,7 @@
 **    May you share freely, never taking more than you give.
 **
 *************************************************************************
-** This is the header file for the generic hash-table implemenation
+** This is the header file for the generic hash-table implementation
 ** used in SQLite.  We've modified it slightly to serve as a standalone
 ** hash table implementation for the full-text indexing module.
 **
diff --git a/chromium/third_party/sqlite/src/ext/fts1/fts1.c b/chromium/third_party/sqlite/src/ext/fts1/fts1.c
index d5429ff320a..482cf759ba1 100644
--- a/chromium/third_party/sqlite/src/ext/fts1/fts1.c
+++ b/chromium/third_party/sqlite/src/ext/fts1/fts1.c
@@ -3335,8 +3335,11 @@ int sqlite3Fts1Init(sqlite3 *db){
 }
 
 #if !SQLITE_CORE
-int sqlite3_extension_init(sqlite3 *db, char **pzErrMsg,
-                           const sqlite3_api_routines *pApi){
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+int sqlite3_fts1_init(sqlite3 *db, char **pzErrMsg,
+                      const sqlite3_api_routines *pApi){
   SQLITE_EXTENSION_INIT2(pApi)
   return sqlite3Fts1Init(db);
 }
diff --git a/chromium/third_party/sqlite/src/ext/fts1/fts1_hash.h b/chromium/third_party/sqlite/src/ext/fts1/fts1_hash.h
index c31c430f7c0..9001152931c 100644
--- a/chromium/third_party/sqlite/src/ext/fts1/fts1_hash.h
+++ b/chromium/third_party/sqlite/src/ext/fts1/fts1_hash.h
@@ -9,7 +9,7 @@
 **    May you share freely, never taking more than you give.
 **
 *************************************************************************
-** This is the header file for the generic hash-table implemenation
+** This is the header file for the generic hash-table implementation
 ** used in SQLite.  We've modified it slightly to serve as a standalone
 ** hash table implementation for the full-text indexing module.
 **
diff --git a/chromium/third_party/sqlite/src/ext/fts1/fulltext.c b/chromium/third_party/sqlite/src/ext/fts1/fulltext.c
index e6034ba0230..313ff303e1a 100644
--- a/chromium/third_party/sqlite/src/ext/fts1/fulltext.c
+++ b/chromium/third_party/sqlite/src/ext/fts1/fulltext.c
@@ -852,8 +852,14 @@ static void fulltext_vtab_destroy(fulltext_vtab *v){
 ** argv[3] - tokenizer name (optional, a sensible default is provided)
 ** argv[4..] - passed to tokenizer (optional based on tokenizer)
 **/
-static int fulltextConnect(sqlite3 *db, void *pAux, int argc, char **argv,
-                           sqlite3_vtab **ppVTab){
+static int fulltextConnect(
+  sqlite3 *db,
+  void *pAux,
+  int argc,
+  const char * const *argv,
+  sqlite3_vtab **ppVTab,
+  char **pzErr
+){
   int rc;
   fulltext_vtab *v;
   sqlite3_tokenizer_module *m = NULL;
@@ -898,8 +904,14 @@ static int fulltextConnect(sqlite3 *db, void *pAux, int argc, char **argv,
   return SQLITE_OK;
 }
 
-static int fulltextCreate(sqlite3 *db, void *pAux, int argc, char **argv,
-                          sqlite3_vtab **ppVTab){
+static int fulltextCreate(
+  sqlite3 *db,
+  void *pAux,
+  int argc,
+  const char * const *argv,
+  sqlite3_vtab **ppVTab,
+  char **pzErr
+){
   int rc;
   assert( argc>=3 );
 
@@ -934,7 +946,7 @@ static int fulltextCreate(sqlite3 *db, void *pAux, int argc, char **argv,
     "create index %_index on %_term(term, first)");
   if( rc!=SQLITE_OK ) return rc;
 
-  return fulltextConnect(db, pAux, argc, argv, ppVTab);
+  return fulltextConnect(db, pAux, argc, argv, ppVTab, pzErr);
 }
 
 /* Decide how to handle an SQL query.
@@ -1488,8 +1500,11 @@ int fulltext_init(sqlite3 *db){
 }
 
 #if !SQLITE_CORE
-int sqlite3_extension_init(sqlite3 *db, char **pzErrMsg,
-                           const sqlite3_api_routines *pApi){
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+int sqlite3_fulltext_init(sqlite3 *db, char **pzErrMsg,
+                          const sqlite3_api_routines *pApi){
  SQLITE_EXTENSION_INIT2(pApi)
  return fulltext_init(db);
 }