diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-31 16:33:43 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-06 16:33:22 +0000 |
| commit | da51f56cc21233c2d30f0fe0d171727c3102b2e0 (patch) | |
| tree | 4e579ab70ce4b19bee7984237f3ce05a96d59d83 /chromium/dbus | |
| parent | c8c2d1901aec01e934adf561a9fdf0cc776cdef8 (diff) | |
| download | qtwebengine-chromium-da51f56cc21233c2d30f0fe0d171727c3102b2e0.tar.gz | |
BASELINE: Update Chromium to 65.0.3525.40
Also imports missing submodules
Change-Id: I36901b7c6a325cda3d2c10cedb2186c25af3b79b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/dbus')
| -rw-r--r-- | chromium/dbus/message.cc | 2 | ||||
| -rw-r--r-- | chromium/dbus/signal_sender_verification_unittest.cc | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/chromium/dbus/message.cc b/chromium/dbus/message.cc index 1e5f54af683..8d8c9b730ba 100644 --- a/chromium/dbus/message.cc +++ b/chromium/dbus/message.cc @@ -143,7 +143,7 @@ std::string Message::ToStringInternal(const std::string& indent, uint64_t value = 0; if (!reader->PopUint64(&value)) return kBrokenMessage; - output += (indent + "uint64_t " + base::Uint64ToString(value) + "\n"); + output += (indent + "uint64_t " + base::NumberToString(value) + "\n"); break; } case DOUBLE: { diff --git a/chromium/dbus/signal_sender_verification_unittest.cc b/chromium/dbus/signal_sender_verification_unittest.cc index 3a5f299ab8e..00a1138d257 100644 --- a/chromium/dbus/signal_sender_verification_unittest.cc +++ b/chromium/dbus/signal_sender_verification_unittest.cc @@ -8,7 +8,6 @@ #include "base/message_loop/message_loop.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/histogram_samples.h" -#include "base/metrics/statistics_recorder.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" #include "base/test/test_timeouts.h" @@ -31,8 +30,6 @@ class SignalSenderVerificationTest : public testing::Test { } void SetUp() override { - base::StatisticsRecorder::Initialize(); - // Make the main thread not to allow IO. base::ThreadRestrictions::SetIOAllowed(false); |