Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(735)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/url_request/url_request_unittest.cc

Issue 2315613002: Extracted NetLog class's inner enum types into their own enum classes and (Closed)
Patch Set: Fixed a straggling, old enum and applied static_cast<int> to the new netlog enum types, since this … Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« net/socket/tcp_socket_win.cc ('K') | « net/url_request/url_request_throttler_manager.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/url_request/url_request_unittest.cc
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 4837e56270e3bb2709eb7cf3cf6a473c98e20619..3d4cfbb94143a103bcddbb3b2a5e31b33d118b62 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -78,6 +78,7 @@
#include "net/http/http_response_headers.h"
#include "net/http/http_util.h"
#include "net/log/net_log.h"
+#include "net/log/net_log_event_type.h"
#include "net/log/test_net_log.h"
#include "net/log/test_net_log_entry.h"
#include "net/log/test_net_log_util.h"
@@ -4810,26 +4811,26 @@ class AsyncDelegateLogger : public base::RefCounted<AsyncDelegateLogger> {
return entries.size();
}
std::string delegate_info;
- EXPECT_EQ(NetLog::TYPE_DELEGATE_INFO, entries[log_position].type);
- EXPECT_EQ(NetLog::PHASE_BEGIN, entries[log_position].phase);
+ EXPECT_EQ(NetLogEventType::DELEGATE_INFO, entries[log_position].type);
+ EXPECT_EQ(NetLogEventPhase::BEGIN, entries[log_position].phase);
EXPECT_TRUE(entries[log_position].GetStringValue("delegate_info",
&delegate_info));
EXPECT_EQ(kFirstDelegateInfo, delegate_info);
++log_position;
- EXPECT_EQ(NetLog::TYPE_DELEGATE_INFO, entries[log_position].type);
- EXPECT_EQ(NetLog::PHASE_END, entries[log_position].phase);
+ EXPECT_EQ(NetLogEventType::DELEGATE_INFO, entries[log_position].type);
+ EXPECT_EQ(NetLogEventPhase::END, entries[log_position].phase);
++log_position;
- EXPECT_EQ(NetLog::TYPE_DELEGATE_INFO, entries[log_position].type);
- EXPECT_EQ(NetLog::PHASE_BEGIN, entries[log_position].phase);
+ EXPECT_EQ(NetLogEventType::DELEGATE_INFO, entries[log_position].type);
+ EXPECT_EQ(NetLogEventPhase::BEGIN, entries[log_position].phase);
EXPECT_TRUE(entries[log_position].GetStringValue("delegate_info",
&delegate_info));
EXPECT_EQ(kSecondDelegateInfo, delegate_info);
++log_position;
- EXPECT_EQ(NetLog::TYPE_DELEGATE_INFO, entries[log_position].type);
- EXPECT_EQ(NetLog::PHASE_END, entries[log_position].phase);
+ EXPECT_EQ(NetLogEventType::DELEGATE_INFO, entries[log_position].type);
+ EXPECT_EQ(NetLogEventPhase::END, entries[log_position].phase);
return log_position + 1;
}
@@ -5089,14 +5090,14 @@ TEST_F(URLRequestTestHTTP, DelegateInfoBeforeStart) {
size_t log_position = ExpectLogContainsSomewhereAfter(
entries,
0,
- NetLog::TYPE_DELEGATE_INFO,
- NetLog::PHASE_BEGIN);
+ NetLogEventType::DELEGATE_INFO,
+ NetLogEventPhase::BEGIN);
log_position = AsyncDelegateLogger::CheckDelegateInfo(entries, log_position);
// Nothing else should add any delegate info to the request.
EXPECT_FALSE(LogContainsEntryWithTypeAfter(
- entries, log_position + 1, NetLog::TYPE_DELEGATE_INFO));
+ entries, log_position + 1, NetLogEventType::DELEGATE_INFO));
}
// Tests handling of delegate info from a network delegate.
@@ -5135,19 +5136,20 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateInfo) {
log_position = ExpectLogContainsSomewhereAfter(
entries,
log_position + 1,
- NetLog::TYPE_URL_REQUEST_DELEGATE,
- NetLog::PHASE_BEGIN);
+ NetLogEventType::URL_REQUEST_DELEGATE,
+ NetLogEventPhase::BEGIN);
log_position = AsyncDelegateLogger::CheckDelegateInfo(entries,
log_position + 1);
ASSERT_LT(log_position, entries.size());
- EXPECT_EQ(NetLog::TYPE_URL_REQUEST_DELEGATE, entries[log_position].type);
- EXPECT_EQ(NetLog::PHASE_END, entries[log_position].phase);
+ EXPECT_EQ(NetLogEventType::URL_REQUEST_DELEGATE,
+ entries[log_position].type);
+ EXPECT_EQ(NetLogEventPhase::END, entries[log_position].phase);
}
EXPECT_FALSE(LogContainsEntryWithTypeAfter(
- entries, log_position + 1, NetLog::TYPE_DELEGATE_INFO));
+ entries, log_position + 1, NetLogEventType::DELEGATE_INFO));
}
// Tests handling of delegate info from a network delegate in the case of an
@@ -5189,42 +5191,44 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateInfoRedirect) {
log_position = ExpectLogContainsSomewhereAfter(
entries,
log_position + 1,
- NetLog::TYPE_URL_REQUEST_DELEGATE,
- NetLog::PHASE_BEGIN);
+ NetLogEventType::URL_REQUEST_DELEGATE,
+ NetLogEventPhase::BEGIN);
log_position = AsyncDelegateLogger::CheckDelegateInfo(entries,
log_position + 1);
ASSERT_LT(log_position, entries.size());
- EXPECT_EQ(NetLog::TYPE_URL_REQUEST_DELEGATE, entries[log_position].type);
- EXPECT_EQ(NetLog::PHASE_END, entries[log_position].phase);
+ EXPECT_EQ(NetLogEventType::URL_REQUEST_DELEGATE,
+ entries[log_position].type);
+ EXPECT_EQ(NetLogEventPhase::END, entries[log_position].phase);
}
// The URLRequest::Delegate then gets informed about the redirect.
log_position = ExpectLogContainsSomewhereAfter(
entries,
log_position + 1,
- NetLog::TYPE_URL_REQUEST_DELEGATE,
- NetLog::PHASE_BEGIN);
+ NetLogEventType::URL_REQUEST_DELEGATE,
+ NetLogEventPhase::BEGIN);
// The NetworkDelegate logged information in the same three events as before.
for (size_t i = 0; i < 3; ++i) {
log_position = ExpectLogContainsSomewhereAfter(
entries,
log_position + 1,
- NetLog::TYPE_URL_REQUEST_DELEGATE,
- NetLog::PHASE_BEGIN);
+ NetLogEventType::URL_REQUEST_DELEGATE,
+ NetLogEventPhase::BEGIN);
log_position = AsyncDelegateLogger::CheckDelegateInfo(entries,
log_position + 1);
ASSERT_LT(log_position, entries.size());
- EXPECT_EQ(NetLog::TYPE_URL_REQUEST_DELEGATE, entries[log_position].type);
- EXPECT_EQ(NetLog::PHASE_END, entries[log_position].phase);
+ EXPECT_EQ(NetLogEventType::URL_REQUEST_DELEGATE,
+ entries[log_position].type);
+ EXPECT_EQ(NetLogEventPhase::END, entries[log_position].phase);
}
EXPECT_FALSE(LogContainsEntryWithTypeAfter(
- entries, log_position + 1, NetLog::TYPE_DELEGATE_INFO));
+ entries, log_position + 1, NetLogEventType::DELEGATE_INFO));
}
// Tests handling of delegate info from a network delegate in the case of HTTP
@@ -5268,19 +5272,20 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateInfoAuth) {
log_position = ExpectLogContainsSomewhereAfter(
entries,
log_position + 1,
- NetLog::TYPE_URL_REQUEST_DELEGATE,
- NetLog::PHASE_BEGIN);
+ NetLogEventType::URL_REQUEST_DELEGATE,
+ NetLogEventPhase::BEGIN);
log_position = AsyncDelegateLogger::CheckDelegateInfo(entries,
log_position + 1);
ASSERT_LT(log_position, entries.size());
- EXPECT_EQ(NetLog::TYPE_URL_REQUEST_DELEGATE, entries[log_position].type);
- EXPECT_EQ(NetLog::PHASE_END, entries[log_position].phase);
+ EXPECT_EQ(NetLogEventType::URL_REQUEST_DELEGATE,
+ entries[log_position].type);
+ EXPECT_EQ(NetLogEventPhase::END, entries[log_position].phase);
}
EXPECT_FALSE(LogContainsEntryWithTypeAfter(
- entries, log_position + 1, NetLog::TYPE_DELEGATE_INFO));
+ entries, log_position + 1, NetLogEventType::DELEGATE_INFO));
}
// TODO(svaldez): Update tests to use EmbeddedTestServer.
@@ -5327,20 +5332,20 @@ TEST_F(URLRequestTestHTTP, URLRequestDelegateInfo) {
log_position =
ExpectLogContainsSomewhereAfter(entries,
log_position + 1,
- NetLog::TYPE_URL_REQUEST_DELEGATE,
- NetLog::PHASE_BEGIN);
+ NetLogEventType::URL_REQUEST_DELEGATE,
+ NetLogEventPhase::BEGIN);
log_position = AsyncDelegateLogger::CheckDelegateInfo(entries,
log_position + 1);
ASSERT_LT(log_position, entries.size());
- EXPECT_EQ(NetLog::TYPE_URL_REQUEST_DELEGATE, entries[log_position].type);
- EXPECT_EQ(NetLog::PHASE_END, entries[log_position].phase);
+ EXPECT_EQ(NetLogEventType::URL_REQUEST_DELEGATE, entries[log_position].type);
+ EXPECT_EQ(NetLogEventPhase::END, entries[log_position].phase);
EXPECT_FALSE(LogContainsEntryWithTypeAfter(
- entries, log_position + 1, NetLog::TYPE_DELEGATE_INFO));
+ entries, log_position + 1, NetLogEventType::DELEGATE_INFO));
EXPECT_FALSE(LogContainsEntryWithTypeAfter(
- entries, log_position + 1, NetLog::TYPE_URL_REQUEST_DELEGATE));
+ entries, log_position + 1, NetLogEventType::URL_REQUEST_DELEGATE));
}
#endif // !defined(OS_IOS)
@@ -5378,21 +5383,22 @@ TEST_F(URLRequestTestHTTP, URLRequestDelegateInfoOnRedirect) {
log_position = ExpectLogContainsSomewhereAfter(
entries,
log_position,
- NetLog::TYPE_URL_REQUEST_DELEGATE,
- NetLog::PHASE_BEGIN);
+ NetLogEventType::URL_REQUEST_DELEGATE,
+ NetLogEventPhase::BEGIN);
log_position = AsyncDelegateLogger::CheckDelegateInfo(entries,
log_position + 1);
ASSERT_LT(log_position, entries.size());
- EXPECT_EQ(NetLog::TYPE_URL_REQUEST_DELEGATE, entries[log_position].type);
- EXPECT_EQ(NetLog::PHASE_END, entries[log_position].phase);
+ EXPECT_EQ(NetLogEventType::URL_REQUEST_DELEGATE,
+ entries[log_position].type);
+ EXPECT_EQ(NetLogEventPhase::END, entries[log_position].phase);
}
EXPECT_FALSE(LogContainsEntryWithTypeAfter(
- entries, log_position + 1, NetLog::TYPE_DELEGATE_INFO));
+ entries, log_position + 1, NetLogEventType::DELEGATE_INFO));
EXPECT_FALSE(LogContainsEntryWithTypeAfter(
- entries, log_position + 1, NetLog::TYPE_URL_REQUEST_DELEGATE));
+ entries, log_position + 1, NetLogEventType::URL_REQUEST_DELEGATE));
}
// Tests handling of delegate info from a URLRequest::Delegate in the case of
@@ -5437,21 +5443,22 @@ TEST_F(URLRequestTestHTTP, URLRequestDelegateOnRedirectCancelled) {
log_position = ExpectLogContainsSomewhereAfter(
entries,
log_position,
- NetLog::TYPE_URL_REQUEST_DELEGATE,
- NetLog::PHASE_BEGIN);
+ NetLogEventType::URL_REQUEST_DELEGATE,
+ NetLogEventPhase::BEGIN);
log_position = AsyncDelegateLogger::CheckDelegateInfo(entries,
log_position + 1);
ASSERT_LT(log_position, entries.size());
- EXPECT_EQ(NetLog::TYPE_URL_REQUEST_DELEGATE, entries[log_position].type);
- EXPECT_EQ(NetLog::PHASE_END, entries[log_position].phase);
+ EXPECT_EQ(NetLogEventType::URL_REQUEST_DELEGATE,
+ entries[log_position].type);
+ EXPECT_EQ(NetLogEventPhase::END, entries[log_position].phase);
}
EXPECT_FALSE(LogContainsEntryWithTypeAfter(
- entries, log_position + 1, NetLog::TYPE_DELEGATE_INFO));
+ entries, log_position + 1, NetLogEventType::DELEGATE_INFO));
EXPECT_FALSE(LogContainsEntryWithTypeAfter(
- entries, log_position + 1, NetLog::TYPE_URL_REQUEST_DELEGATE));
+ entries, log_position + 1, NetLogEventType::URL_REQUEST_DELEGATE));
}
}
« net/socket/tcp_socket_win.cc ('K') | « net/url_request/url_request_throttler_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698