diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-14 17:41:05 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:37:36 +0000 |
| commit | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (patch) | |
| tree | 6b06b60ff365abef0e13b3503d593a0df48d20e8 /chromium/components/upload_list | |
| parent | 7366110654eec46f21b6824f302356426f48cd74 (diff) | |
| download | qtwebengine-chromium-399c965b6064c440ddcf4015f5f8e9d131c7a0a6.tar.gz | |
BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1
Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/components/upload_list')
| -rw-r--r-- | chromium/components/upload_list/upload_list.cc | 2 | ||||
| -rw-r--r-- | chromium/components/upload_list/upload_list_unittest.cc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/chromium/components/upload_list/upload_list.cc b/chromium/components/upload_list/upload_list.cc index c0fe9391858..8ef4c2ee3a0 100644 --- a/chromium/components/upload_list/upload_list.cc +++ b/chromium/components/upload_list/upload_list.cc @@ -14,8 +14,8 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -#include "base/thread_task_runner_handle.h" #include "base/threading/sequenced_worker_pool.h" +#include "base/threading/thread_task_runner_handle.h" UploadList::UploadInfo::UploadInfo(const std::string& upload_id, const base::Time& upload_time, diff --git a/chromium/components/upload_list/upload_list_unittest.cc b/chromium/components/upload_list/upload_list_unittest.cc index 450199c33bc..657f7db9e09 100644 --- a/chromium/components/upload_list/upload_list_unittest.cc +++ b/chromium/components/upload_list/upload_list_unittest.cc @@ -36,7 +36,8 @@ class UploadListTest : public testing::Test, } void WriteUploadLog(const std::string& log_data) { - ASSERT_GT(base::WriteFile(log_path(), log_data.c_str(), log_data.size()), + ASSERT_GT(base::WriteFile(log_path(), log_data.c_str(), + static_cast<int>(log_data.size())), 0); } |