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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/proxy/proxy_script_decider_unittest.cc

Issue 2315613002: Extracted NetLog class's inner enum types into their own enum classes and (Closed)
Patch Set: 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/log/net_log_event_type_list.h ('K') | « net/proxy/proxy_script_decider.cc ('k') | net/proxy/proxy_service.cc » ('j') | net/proxy/proxy_service_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_script_decider_unittest.cc
diff --git a/net/proxy/proxy_script_decider_unittest.cc b/net/proxy/proxy_script_decider_unittest.cc
index ab4a0f7f315ca943f3f07d9461675e30ea5ac111..7e5df50721c78b3da8eb1c8191073a779ace245d 100644
--- a/net/proxy/proxy_script_decider_unittest.cc
+++ b/net/proxy/proxy_script_decider_unittest.cc
@@ -18,6 +18,7 @@
#include "net/base/test_completion_callback.h"
#include "net/dns/mock_host_resolver.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"
@@ -210,13 +211,13 @@ TEST(ProxyScriptDeciderTest, CustomPacSucceeds) {
EXPECT_EQ(4u, entries.size());
EXPECT_TRUE(LogContainsBeginEvent(
- entries, 0, NetLog::TYPE_PROXY_SCRIPT_DECIDER));
+ entries, 0, NetLogEventType::PROXY_SCRIPT_DECIDER));
EXPECT_TRUE(LogContainsBeginEvent(
- entries, 1, NetLog::TYPE_PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
+ entries, 1, NetLogEventType::PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
EXPECT_TRUE(LogContainsEndEvent(
- entries, 2, NetLog::TYPE_PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
+ entries, 2, NetLogEventType::PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
EXPECT_TRUE(LogContainsEndEvent(
- entries, 3, NetLog::TYPE_PROXY_SCRIPT_DECIDER));
+ entries, 3, NetLogEventType::PROXY_SCRIPT_DECIDER));
EXPECT_TRUE(decider.effective_config().has_pac_url());
EXPECT_EQ(config.pac_url(), decider.effective_config().pac_url());
@@ -247,13 +248,13 @@ TEST(ProxyScriptDeciderTest, CustomPacFails1) {
EXPECT_EQ(4u, entries.size());
EXPECT_TRUE(LogContainsBeginEvent(
- entries, 0, NetLog::TYPE_PROXY_SCRIPT_DECIDER));
+ entries, 0, NetLogEventType::PROXY_SCRIPT_DECIDER));
EXPECT_TRUE(LogContainsBeginEvent(
- entries, 1, NetLog::TYPE_PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
+ entries, 1, NetLogEventType::PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
EXPECT_TRUE(LogContainsEndEvent(
- entries, 2, NetLog::TYPE_PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
+ entries, 2, NetLogEventType::PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
EXPECT_TRUE(LogContainsEndEvent(
- entries, 3, NetLog::TYPE_PROXY_SCRIPT_DECIDER));
+ entries, 3, NetLogEventType::PROXY_SCRIPT_DECIDER));
EXPECT_FALSE(decider.effective_config().has_pac_url());
}
@@ -507,33 +508,33 @@ TEST(ProxyScriptDeciderTest, AutodetectFailCustomSuccess2) {
EXPECT_EQ(10u, entries.size());
EXPECT_TRUE(LogContainsBeginEvent(
- entries, 0, NetLog::TYPE_PROXY_SCRIPT_DECIDER));
+ entries, 0, NetLogEventType::PROXY_SCRIPT_DECIDER));
// This is the DHCP phase, which fails fetching rather than parsing, so
// there is no pair of SET_PAC_SCRIPT events.
EXPECT_TRUE(LogContainsBeginEvent(
- entries, 1, NetLog::TYPE_PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
+ entries, 1, NetLogEventType::PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
EXPECT_TRUE(LogContainsEndEvent(
- entries, 2, NetLog::TYPE_PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
+ entries, 2, NetLogEventType::PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
EXPECT_TRUE(LogContainsEvent(
entries, 3,
- NetLog::TYPE_PROXY_SCRIPT_DECIDER_FALLING_BACK_TO_NEXT_PAC_SOURCE,
- NetLog::PHASE_NONE));
+ NetLogEventType::PROXY_SCRIPT_DECIDER_FALLING_BACK_TO_NEXT_PAC_SOURCE,
+ NetLogEventPhase::NONE));
// This is the DNS phase, which attempts a fetch but fails.
EXPECT_TRUE(LogContainsBeginEvent(
- entries, 4, NetLog::TYPE_PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
+ entries, 4, NetLogEventType::PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
EXPECT_TRUE(LogContainsEndEvent(
- entries, 5, NetLog::TYPE_PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
+ entries, 5, NetLogEventType::PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
EXPECT_TRUE(LogContainsEvent(
entries, 6,
- NetLog::TYPE_PROXY_SCRIPT_DECIDER_FALLING_BACK_TO_NEXT_PAC_SOURCE,
- NetLog::PHASE_NONE));
+ NetLogEventType::PROXY_SCRIPT_DECIDER_FALLING_BACK_TO_NEXT_PAC_SOURCE,
+ NetLogEventPhase::NONE));
// Finally, the custom PAC URL phase.
EXPECT_TRUE(LogContainsBeginEvent(
- entries, 7, NetLog::TYPE_PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
+ entries, 7, NetLogEventType::PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
EXPECT_TRUE(LogContainsEndEvent(
- entries, 8, NetLog::TYPE_PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
+ entries, 8, NetLogEventType::PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
EXPECT_TRUE(LogContainsEndEvent(
- entries, 9, NetLog::TYPE_PROXY_SCRIPT_DECIDER));
+ entries, 9, NetLogEventType::PROXY_SCRIPT_DECIDER));
}
// Fails at WPAD (downloading), and fails at custom PAC (downloading).
@@ -607,17 +608,17 @@ TEST(ProxyScriptDeciderTest, CustomPacFails1_WithPositiveDelay) {
EXPECT_EQ(6u, entries.size());
EXPECT_TRUE(LogContainsBeginEvent(
- entries, 0, NetLog::TYPE_PROXY_SCRIPT_DECIDER));
+ entries, 0, NetLogEventType::PROXY_SCRIPT_DECIDER));
EXPECT_TRUE(LogContainsBeginEvent(
- entries, 1, NetLog::TYPE_PROXY_SCRIPT_DECIDER_WAIT));
+ entries, 1, NetLogEventType::PROXY_SCRIPT_DECIDER_WAIT));
EXPECT_TRUE(LogContainsEndEvent(
- entries, 2, NetLog::TYPE_PROXY_SCRIPT_DECIDER_WAIT));
+ entries, 2, NetLogEventType::PROXY_SCRIPT_DECIDER_WAIT));
EXPECT_TRUE(LogContainsBeginEvent(
- entries, 3, NetLog::TYPE_PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
+ entries, 3, NetLogEventType::PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
EXPECT_TRUE(LogContainsEndEvent(
- entries, 4, NetLog::TYPE_PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
+ entries, 4, NetLogEventType::PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
EXPECT_TRUE(LogContainsEndEvent(
- entries, 5, NetLog::TYPE_PROXY_SCRIPT_DECIDER));
+ entries, 5, NetLogEventType::PROXY_SCRIPT_DECIDER));
}
// This is a copy-paste of CustomPacFails1, with the exception that we give it
@@ -647,13 +648,13 @@ TEST(ProxyScriptDeciderTest, CustomPacFails1_WithNegativeDelay) {
EXPECT_EQ(4u, entries.size());
EXPECT_TRUE(LogContainsBeginEvent(
- entries, 0, NetLog::TYPE_PROXY_SCRIPT_DECIDER));
+ entries, 0, NetLogEventType::PROXY_SCRIPT_DECIDER));
EXPECT_TRUE(LogContainsBeginEvent(
- entries, 1, NetLog::TYPE_PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
+ entries, 1, NetLogEventType::PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
EXPECT_TRUE(LogContainsEndEvent(
- entries, 2, NetLog::TYPE_PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
+ entries, 2, NetLogEventType::PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
EXPECT_TRUE(LogContainsEndEvent(
- entries, 3, NetLog::TYPE_PROXY_SCRIPT_DECIDER));
+ entries, 3, NetLogEventType::PROXY_SCRIPT_DECIDER));
}
class SynchronousSuccessDhcpFetcher : public DhcpProxyScriptFetcher {
« net/log/net_log_event_type_list.h ('K') | « net/proxy/proxy_script_decider.cc ('k') | net/proxy/proxy_service.cc » ('j') | net/proxy/proxy_service_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698