From 39d357e3248f80abea0159765ff39554affb40db Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 4 Jan 2017 14:17:57 +0100 Subject: BASELINE: Update Chromium to 55.0.2883.105 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit And updates ninja to 1.7.2 Change-Id: I20d43c737f82764d857ada9a55586901b18b9243 Reviewed-by: Michael Brüning --- chromium/net/log/test_net_log_util.cc | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) (limited to 'chromium/net/log/test_net_log_util.cc') diff --git a/chromium/net/log/test_net_log_util.cc b/chromium/net/log/test_net_log_util.cc index 66e48217655..db79aeea33c 100644 --- a/chromium/net/log/test_net_log_util.cc +++ b/chromium/net/log/test_net_log_util.cc @@ -6,6 +6,8 @@ #include +#include "net/log/net_log.h" + namespace net { namespace { @@ -30,8 +32,8 @@ size_t GetIndex(const TestNetLogEntry::List& entries, int offset) { ::testing::AssertionResult LogContainsEvent( const TestNetLogEntry::List& entries, int offset, - NetLog::EventType expected_event, - NetLog::EventPhase expected_phase) { + NetLogEventType expected_event, + NetLogEventPhase expected_phase) { size_t index = GetIndex(entries, offset); if (index >= entries.size()) return ::testing::AssertionFailure() << index << " is out of bounds."; @@ -44,8 +46,8 @@ size_t GetIndex(const TestNetLogEntry::List& entries, int offset) { } if (expected_phase != entry.phase) { return ::testing::AssertionFailure() - << "Actual phase: " << entry.phase - << ". Expected phase: " << expected_phase << "."; + << "Actual phase: " << static_cast(entry.phase) + << ". Expected phase: " << static_cast(expected_phase) << "."; } return ::testing::AssertionSuccess(); } @@ -53,21 +55,23 @@ size_t GetIndex(const TestNetLogEntry::List& entries, int offset) { ::testing::AssertionResult LogContainsBeginEvent( const TestNetLogEntry::List& entries, int offset, - NetLog::EventType expected_event) { - return LogContainsEvent(entries, offset, expected_event, NetLog::PHASE_BEGIN); + NetLogEventType expected_event) { + return LogContainsEvent(entries, offset, expected_event, + NetLogEventPhase::BEGIN); } ::testing::AssertionResult LogContainsEndEvent( const TestNetLogEntry::List& entries, int offset, - NetLog::EventType expected_event) { - return LogContainsEvent(entries, offset, expected_event, NetLog::PHASE_END); + NetLogEventType expected_event) { + return LogContainsEvent(entries, offset, expected_event, + NetLogEventPhase::END); } ::testing::AssertionResult LogContainsEntryWithType( const TestNetLogEntry::List& entries, int offset, - NetLog::EventType type) { + NetLogEventType type) { size_t index = GetIndex(entries, offset); if (index >= entries.size()) return ::testing::AssertionFailure() << index << " is out of bounds."; @@ -80,7 +84,7 @@ size_t GetIndex(const TestNetLogEntry::List& entries, int offset) { ::testing::AssertionResult LogContainsEntryWithTypeAfter( const TestNetLogEntry::List& entries, int start_offset, - NetLog::EventType type) { + NetLogEventType type) { for (size_t i = GetIndex(entries, start_offset); i < entries.size(); ++i) { const TestNetLogEntry& entry = entries[i]; if (entry.type == type) @@ -91,8 +95,8 @@ size_t GetIndex(const TestNetLogEntry::List& entries, int offset) { size_t ExpectLogContainsSomewhere(const TestNetLogEntry::List& entries, size_t min_offset, - NetLog::EventType expected_event, - NetLog::EventPhase expected_phase) { + NetLogEventType expected_event, + NetLogEventPhase expected_phase) { size_t min_index = GetIndex(entries, min_offset); size_t i = 0; for (; i < entries.size(); ++i) { @@ -107,8 +111,8 @@ size_t ExpectLogContainsSomewhere(const TestNetLogEntry::List& entries, size_t ExpectLogContainsSomewhereAfter(const TestNetLogEntry::List& entries, size_t start_offset, - NetLog::EventType expected_event, - NetLog::EventPhase expected_phase) { + NetLogEventType expected_event, + NetLogEventPhase expected_phase) { size_t i = GetIndex(entries, start_offset); for (; i < entries.size(); ++i) { const TestNetLogEntry& entry = entries[i]; -- cgit v1.2.1