diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-06 12:48:11 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:33:43 +0000 |
commit | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (patch) | |
tree | fa14ba0ca8d2683ba2efdabd246dc9b18a1229c6 /chromium/sql | |
parent | 79b4f909db1049fca459c07cca55af56a9b54fe3 (diff) | |
download | qtwebengine-chromium-7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3.tar.gz |
BASELINE: Update Chromium to 84.0.4147.141
Change-Id: Ib85eb4cfa1cbe2b2b81e5022c8cad5c493969535
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/sql')
-rw-r--r-- | chromium/sql/meta_table.cc | 2 | ||||
-rw-r--r-- | chromium/sql/recover_module/btree.cc | 2 | ||||
-rw-r--r-- | chromium/sql/recover_module/integers.cc | 2 | ||||
-rw-r--r-- | chromium/sql/recover_module/module.cc | 2 | ||||
-rw-r--r-- | chromium/sql/recover_module/module_unittest.cc | 4 | ||||
-rw-r--r-- | chromium/sql/recover_module/parsing.cc | 3 | ||||
-rw-r--r-- | chromium/sql/recover_module/payload.cc | 2 | ||||
-rw-r--r-- | chromium/sql/recover_module/record.cc | 2 | ||||
-rw-r--r-- | chromium/sql/recover_module/table.cc | 2 | ||||
-rw-r--r-- | chromium/sql/transaction.cc | 2 | ||||
-rw-r--r-- | chromium/sql/vfs_wrapper.cc | 3 | ||||
-rw-r--r-- | chromium/sql/vfs_wrapper_fuchsia.cc | 1 |
12 files changed, 16 insertions, 11 deletions
diff --git a/chromium/sql/meta_table.cc b/chromium/sql/meta_table.cc index d2555411a2f..6bf0cffbe42 100644 --- a/chromium/sql/meta_table.cc +++ b/chromium/sql/meta_table.cc @@ -6,7 +6,7 @@ #include <stdint.h> -#include "base/logging.h" +#include "base/check_op.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_util.h" #include "sql/database.h" diff --git a/chromium/sql/recover_module/btree.cc b/chromium/sql/recover_module/btree.cc index 57067ac2494..9ecaafe8a34 100644 --- a/chromium/sql/recover_module/btree.cc +++ b/chromium/sql/recover_module/btree.cc @@ -8,7 +8,7 @@ #include <limits> #include <type_traits> -#include "base/logging.h" +#include "base/check_op.h" #include "sql/recover_module/integers.h" #include "sql/recover_module/pager.h" #include "third_party/sqlite/sqlite3.h" diff --git a/chromium/sql/recover_module/integers.cc b/chromium/sql/recover_module/integers.cc index 476ccf81cf5..b51fd0adb16 100644 --- a/chromium/sql/recover_module/integers.cc +++ b/chromium/sql/recover_module/integers.cc @@ -4,7 +4,7 @@ #include "sql/recover_module/integers.h" -#include "base/logging.h" +#include "base/check_op.h" namespace sql { namespace recover { diff --git a/chromium/sql/recover_module/module.cc b/chromium/sql/recover_module/module.cc index 3b68ea42e86..2b2b1f8993e 100644 --- a/chromium/sql/recover_module/module.cc +++ b/chromium/sql/recover_module/module.cc @@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/logging.h" +#include "base/check_op.h" #include "base/strings/strcat.h" #include "base/strings/string_piece.h" #include "base/strings/string_util.h" diff --git a/chromium/sql/recover_module/module_unittest.cc b/chromium/sql/recover_module/module_unittest.cc index ef3e3e2b7b4..ba620b7fda6 100644 --- a/chromium/sql/recover_module/module_unittest.cc +++ b/chromium/sql/recover_module/module_unittest.cc @@ -534,7 +534,7 @@ TEST_F(RecoverModuleTest, Floats) { ASSERT_TRUE(statement.Step()); EXPECT_EQ(2, statement.ColumnInt(0)); EXPECT_EQ("INTEGER", statement.ColumnString(1)); - EXPECT_EQ(sql::ColumnType::kFloat, statement.GetColumnType(2)); + EXPECT_EQ(sql::ColumnType::kInteger, statement.GetColumnType(2)); EXPECT_EQ(17, statement.ColumnInt(2)); ASSERT_TRUE(statement.Step()); EXPECT_EQ(3, statement.ColumnInt(0)); @@ -556,7 +556,7 @@ TEST_F(RecoverModuleTest, NonNullFloats) { ASSERT_TRUE(statement.Step()); EXPECT_EQ(2, statement.ColumnInt(0)); EXPECT_EQ("INTEGER", statement.ColumnString(1)); - EXPECT_EQ(sql::ColumnType::kFloat, statement.GetColumnType(2)); + EXPECT_EQ(sql::ColumnType::kInteger, statement.GetColumnType(2)); EXPECT_EQ(17, statement.ColumnInt(2)); ASSERT_TRUE(statement.Step()); EXPECT_EQ(3, statement.ColumnInt(0)); diff --git a/chromium/sql/recover_module/parsing.cc b/chromium/sql/recover_module/parsing.cc index 85a1b5a7193..383ebe275b2 100644 --- a/chromium/sql/recover_module/parsing.cc +++ b/chromium/sql/recover_module/parsing.cc @@ -8,7 +8,8 @@ #include <tuple> #include <utility> -#include "base/logging.h" +#include "base/check.h" +#include "base/notreached.h" #include "base/optional.h" #include "base/strings/strcat.h" #include "base/strings/string_piece.h" diff --git a/chromium/sql/recover_module/payload.cc b/chromium/sql/recover_module/payload.cc index f7c4f458a1b..282a4320178 100644 --- a/chromium/sql/recover_module/payload.cc +++ b/chromium/sql/recover_module/payload.cc @@ -10,7 +10,7 @@ #include <limits> #include <type_traits> -#include "base/logging.h" +#include "base/check_op.h" #include "sql/recover_module/btree.h" #include "sql/recover_module/integers.h" #include "sql/recover_module/pager.h" diff --git a/chromium/sql/recover_module/record.cc b/chromium/sql/recover_module/record.cc index 7cf0132ecc1..6c2be3fe91d 100644 --- a/chromium/sql/recover_module/record.cc +++ b/chromium/sql/recover_module/record.cc @@ -8,6 +8,8 @@ #include <limits> #include <type_traits> +#include "base/check_op.h" +#include "base/notreached.h" #include "sql/recover_module/integers.h" #include "sql/recover_module/payload.h" #include "third_party/sqlite/sqlite3.h" diff --git a/chromium/sql/recover_module/table.cc b/chromium/sql/recover_module/table.cc index 26d9f695f8b..65857e4368d 100644 --- a/chromium/sql/recover_module/table.cc +++ b/chromium/sql/recover_module/table.cc @@ -4,7 +4,7 @@ #include "sql/recover_module/table.h" -#include "base/logging.h" +#include "base/check_op.h" #include "base/strings/strcat.h" #include "base/strings/string_piece.h" #include "base/strings/string_util.h" diff --git a/chromium/sql/transaction.cc b/chromium/sql/transaction.cc index c9d90f1ccbc..4abc41013b0 100644 --- a/chromium/sql/transaction.cc +++ b/chromium/sql/transaction.cc @@ -4,7 +4,7 @@ #include "sql/transaction.h" -#include "base/logging.h" +#include "base/check.h" #include "sql/database.h" namespace sql { diff --git a/chromium/sql/vfs_wrapper.cc b/chromium/sql/vfs_wrapper.cc index c3c2b9ae241..672f4e306e2 100644 --- a/chromium/sql/vfs_wrapper.cc +++ b/chromium/sql/vfs_wrapper.cc @@ -8,11 +8,12 @@ #include <string> #include <vector> +#include "base/check_op.h" #include "base/debug/leak_annotations.h" #include "base/files/file_path.h" -#include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" +#include "base/notreached.h" #include "base/strings/string_piece.h" #include "build/build_config.h" diff --git a/chromium/sql/vfs_wrapper_fuchsia.cc b/chromium/sql/vfs_wrapper_fuchsia.cc index 8cf3b6bda20..89d24518502 100644 --- a/chromium/sql/vfs_wrapper_fuchsia.cc +++ b/chromium/sql/vfs_wrapper_fuchsia.cc @@ -5,6 +5,7 @@ #include "sql/vfs_wrapper_fuchsia.h" #include "base/containers/flat_set.h" +#include "base/logging.h" #include "base/no_destructor.h" #include "base/synchronization/lock.h" #include "base/thread_annotations.h" |