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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/proxy/proxy_script_decider_unittest.cc

Issue 266243004: Clang format slam. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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/base/mime_util_unittest.cc ('K') | « net/proxy/proxy_script_decider.cc ('k') | net/proxy/proxy_script_fetcher.h » ('j') | no next file with comments »
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 c50b31e4a9124c4731e3e72ff66e5842426afebd..4241c58b95324da960f85fc04a738aef38fa6d46 100644
--- a/net/proxy/proxy_script_decider_unittest.cc
+++ b/net/proxy/proxy_script_decider_unittest.cc
@@ -39,8 +39,7 @@ class Rules {
Rule(const GURL& url, int fetch_error, bool is_valid_script)
: url(url),
fetch_error(fetch_error),
- is_valid_script(is_valid_script) {
- }
+ is_valid_script(is_valid_script) {}
base::string16 text() const {
if (is_valid_script)
@@ -62,8 +61,8 @@ class Rules {
}
void AddFailDownloadRule(const char* url) {
- rules_.push_back(Rule(GURL(url), kFailedDownloading /*fetch_error*/,
- false));
+ rules_.push_back(
+ Rule(GURL(url), kFailedDownloading /*fetch_error*/, false));
}
void AddFailParsingRule(const char* url) {
@@ -149,9 +148,11 @@ class MockDhcpProxyScriptFetcher : public DhcpProxyScriptFetcher {
DISALLOW_COPY_AND_ASSIGN(MockDhcpProxyScriptFetcher);
};
-MockDhcpProxyScriptFetcher::MockDhcpProxyScriptFetcher() { }
+MockDhcpProxyScriptFetcher::MockDhcpProxyScriptFetcher() {
+}
-MockDhcpProxyScriptFetcher::~MockDhcpProxyScriptFetcher() { }
+MockDhcpProxyScriptFetcher::~MockDhcpProxyScriptFetcher() {
+}
int MockDhcpProxyScriptFetcher::Fetch(base::string16* utf16_text,
const CompletionCallback& callback) {
@@ -160,7 +161,8 @@ int MockDhcpProxyScriptFetcher::Fetch(base::string16* utf16_text,
return ERR_IO_PENDING;
}
-void MockDhcpProxyScriptFetcher::Cancel() { }
+void MockDhcpProxyScriptFetcher::Cancel() {
+}
const GURL& MockDhcpProxyScriptFetcher::GetPacURL() const {
return gurl_;
@@ -171,7 +173,8 @@ void MockDhcpProxyScriptFetcher::SetPacURL(const GURL& url) {
}
void MockDhcpProxyScriptFetcher::CompleteRequests(
- int result, const base::string16& script) {
+ int result,
+ const base::string16& script) {
*utf16_text_ = script;
callback_.Run(result);
}
@@ -190,8 +193,8 @@ TEST(ProxyScriptDeciderTest, CustomPacSucceeds) {
TestCompletionCallback callback;
CapturingNetLog log;
ProxyScriptDecider decider(&fetcher, &dhcp_fetcher, &log);
- EXPECT_EQ(OK, decider.Start(
- config, base::TimeDelta(), true, callback.callback()));
+ EXPECT_EQ(
+ OK, decider.Start(config, base::TimeDelta(), true, callback.callback()));
EXPECT_EQ(rule.text(), decider.script_data()->utf16());
// Check the NetLog was filled correctly.
@@ -199,14 +202,14 @@ TEST(ProxyScriptDeciderTest, CustomPacSucceeds) {
log.GetEntries(&entries);
EXPECT_EQ(4u, entries.size());
- EXPECT_TRUE(LogContainsBeginEvent(
- entries, 0, NetLog::TYPE_PROXY_SCRIPT_DECIDER));
+ EXPECT_TRUE(
+ LogContainsBeginEvent(entries, 0, NetLog::TYPE_PROXY_SCRIPT_DECIDER));
EXPECT_TRUE(LogContainsBeginEvent(
entries, 1, NetLog::TYPE_PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
EXPECT_TRUE(LogContainsEndEvent(
entries, 2, NetLog::TYPE_PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
- EXPECT_TRUE(LogContainsEndEvent(
- entries, 3, NetLog::TYPE_PROXY_SCRIPT_DECIDER));
+ EXPECT_TRUE(
+ LogContainsEndEvent(entries, 3, NetLog::TYPE_PROXY_SCRIPT_DECIDER));
EXPECT_TRUE(decider.effective_config().has_pac_url());
EXPECT_EQ(config.pac_url(), decider.effective_config().pac_url());
@@ -226,9 +229,9 @@ TEST(ProxyScriptDeciderTest, CustomPacFails1) {
TestCompletionCallback callback;
CapturingNetLog log;
ProxyScriptDecider decider(&fetcher, &dhcp_fetcher, &log);
- EXPECT_EQ(kFailedDownloading,
- decider.Start(config, base::TimeDelta(), true,
- callback.callback()));
+ EXPECT_EQ(
+ kFailedDownloading,
+ decider.Start(config, base::TimeDelta(), true, callback.callback()));
EXPECT_EQ(NULL, decider.script_data());
// Check the NetLog was filled correctly.
@@ -236,14 +239,14 @@ TEST(ProxyScriptDeciderTest, CustomPacFails1) {
log.GetEntries(&entries);
EXPECT_EQ(4u, entries.size());
- EXPECT_TRUE(LogContainsBeginEvent(
- entries, 0, NetLog::TYPE_PROXY_SCRIPT_DECIDER));
+ EXPECT_TRUE(
+ LogContainsBeginEvent(entries, 0, NetLog::TYPE_PROXY_SCRIPT_DECIDER));
EXPECT_TRUE(LogContainsBeginEvent(
entries, 1, NetLog::TYPE_PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
EXPECT_TRUE(LogContainsEndEvent(
entries, 2, NetLog::TYPE_PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
- EXPECT_TRUE(LogContainsEndEvent(
- entries, 3, NetLog::TYPE_PROXY_SCRIPT_DECIDER));
+ EXPECT_TRUE(
+ LogContainsEndEvent(entries, 3, NetLog::TYPE_PROXY_SCRIPT_DECIDER));
EXPECT_FALSE(decider.effective_config().has_pac_url());
}
@@ -261,9 +264,9 @@ TEST(ProxyScriptDeciderTest, CustomPacFails2) {
TestCompletionCallback callback;
ProxyScriptDecider decider(&fetcher, &dhcp_fetcher, NULL);
- EXPECT_EQ(kFailedParsing,
- decider.Start(config, base::TimeDelta(), true,
- callback.callback()));
+ EXPECT_EQ(
+ kFailedParsing,
+ decider.Start(config, base::TimeDelta(), true, callback.callback()));
EXPECT_EQ(NULL, decider.script_data());
}
@@ -277,9 +280,9 @@ TEST(ProxyScriptDeciderTest, HasNullProxyScriptFetcher) {
TestCompletionCallback callback;
ProxyScriptDecider decider(NULL, &dhcp_fetcher, NULL);
- EXPECT_EQ(ERR_UNEXPECTED,
- decider.Start(config, base::TimeDelta(), true,
- callback.callback()));
+ EXPECT_EQ(
+ ERR_UNEXPECTED,
+ decider.Start(config, base::TimeDelta(), true, callback.callback()));
EXPECT_EQ(NULL, decider.script_data());
}
@@ -296,8 +299,8 @@ TEST(ProxyScriptDeciderTest, AutodetectSuccess) {
TestCompletionCallback callback;
ProxyScriptDecider decider(&fetcher, &dhcp_fetcher, NULL);
- EXPECT_EQ(OK, decider.Start(
- config, base::TimeDelta(), true, callback.callback()));
+ EXPECT_EQ(
+ OK, decider.Start(config, base::TimeDelta(), true, callback.callback()));
EXPECT_EQ(rule.text(), decider.script_data()->utf16());
EXPECT_TRUE(decider.effective_config().has_pac_url());
@@ -308,7 +311,7 @@ class ProxyScriptDeciderQuickCheckTest : public ::testing::Test {
public:
ProxyScriptDeciderQuickCheckTest()
: rule_(rules_.AddSuccessRule("http://wpad/wpad.dat")),
- fetcher_(&rules_) { }
+ fetcher_(&rules_) {}
virtual void SetUp() OVERRIDE {
request_context_.set_host_resolver(&resolver_);
@@ -318,8 +321,8 @@ class ProxyScriptDeciderQuickCheckTest : public ::testing::Test {
}
int StartDecider() {
- return decider_->Start(config_, base::TimeDelta(), true,
- callback_.callback());
+ return decider_->Start(
+ config_, base::TimeDelta(), true, callback_.callback());
}
protected:
@@ -390,7 +393,7 @@ TEST_F(ProxyScriptDeciderQuickCheckTest, AsyncTimeout) {
// Fails if DHCP check doesn't take place before QuickCheck.
TEST_F(ProxyScriptDeciderQuickCheckTest, QuickCheckInhibitsDhcp) {
MockDhcpProxyScriptFetcher dhcp_fetcher;
- const char *kPac = "function FindProxyForURL(u,h) { return \"DIRECT\"; }";
+ const char* kPac = "function FindProxyForURL(u,h) { return \"DIRECT\"; }";
base::string16 pac_contents = base::UTF8ToUTF16(kPac);
GURL url("http://foobar/baz");
dhcp_fetcher.SetPacURL(url);
@@ -406,7 +409,7 @@ TEST_F(ProxyScriptDeciderQuickCheckTest, QuickCheckInhibitsDhcp) {
// mean a QuickCheck failure, then ensure that our ProxyScriptFetcher is still
// asked to fetch.
TEST_F(ProxyScriptDeciderQuickCheckTest, QuickCheckDisabled) {
- const char *kPac = "function FindProxyForURL(u,h) { return \"DIRECT\"; }";
+ const char* kPac = "function FindProxyForURL(u,h) { return \"DIRECT\"; }";
resolver_.set_synchronous_mode(true);
resolver_.rules()->AddSimulatedFailure("wpad");
MockProxyScriptFetcher fetcher;
@@ -417,7 +420,7 @@ TEST_F(ProxyScriptDeciderQuickCheckTest, QuickCheckDisabled) {
}
TEST_F(ProxyScriptDeciderQuickCheckTest, ExplicitPacUrl) {
- const char *kCustomUrl = "http://custom/proxy.pac";
+ const char* kCustomUrl = "http://custom/proxy.pac";
config_.set_pac_url(GURL(kCustomUrl));
Rules::Rule rule = rules_.AddSuccessRule(kCustomUrl);
resolver_.rules()->AddSimulatedFailure("wpad");
@@ -443,8 +446,8 @@ TEST(ProxyScriptDeciderTest, AutodetectFailCustomSuccess1) {
TestCompletionCallback callback;
ProxyScriptDecider decider(&fetcher, &dhcp_fetcher, NULL);
- EXPECT_EQ(OK, decider.Start(
- config, base::TimeDelta(), true, callback.callback()));
+ EXPECT_EQ(
+ OK, decider.Start(config, base::TimeDelta(), true, callback.callback()));
EXPECT_EQ(rule.text(), decider.script_data()->utf16());
EXPECT_TRUE(decider.effective_config().has_pac_url());
@@ -470,8 +473,8 @@ TEST(ProxyScriptDeciderTest, AutodetectFailCustomSuccess2) {
CapturingNetLog log;
ProxyScriptDecider decider(&fetcher, &dhcp_fetcher, &log);
- EXPECT_EQ(OK, decider.Start(config, base::TimeDelta(),
- true, callback.callback()));
+ EXPECT_EQ(
+ OK, decider.Start(config, base::TimeDelta(), true, callback.callback()));
EXPECT_EQ(rule.text(), decider.script_data()->utf16());
// Verify that the effective configuration no longer contains auto detect or
@@ -486,8 +489,8 @@ TEST(ProxyScriptDeciderTest, AutodetectFailCustomSuccess2) {
log.GetEntries(&entries);
EXPECT_EQ(10u, entries.size());
- EXPECT_TRUE(LogContainsBeginEvent(
- entries, 0, NetLog::TYPE_PROXY_SCRIPT_DECIDER));
+ EXPECT_TRUE(
+ LogContainsBeginEvent(entries, 0, NetLog::TYPE_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(
@@ -495,7 +498,8 @@ TEST(ProxyScriptDeciderTest, AutodetectFailCustomSuccess2) {
EXPECT_TRUE(LogContainsEndEvent(
entries, 2, NetLog::TYPE_PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
EXPECT_TRUE(LogContainsEvent(
- entries, 3,
+ entries,
+ 3,
NetLog::TYPE_PROXY_SCRIPT_DECIDER_FALLING_BACK_TO_NEXT_PAC_SOURCE,
NetLog::PHASE_NONE));
// This is the DNS phase, which attempts a fetch but fails.
@@ -504,7 +508,8 @@ TEST(ProxyScriptDeciderTest, AutodetectFailCustomSuccess2) {
EXPECT_TRUE(LogContainsEndEvent(
entries, 5, NetLog::TYPE_PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
EXPECT_TRUE(LogContainsEvent(
- entries, 6,
+ entries,
+ 6,
NetLog::TYPE_PROXY_SCRIPT_DECIDER_FALLING_BACK_TO_NEXT_PAC_SOURCE,
NetLog::PHASE_NONE));
// Finally, the custom PAC URL phase.
@@ -512,8 +517,8 @@ TEST(ProxyScriptDeciderTest, AutodetectFailCustomSuccess2) {
entries, 7, NetLog::TYPE_PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
EXPECT_TRUE(LogContainsEndEvent(
entries, 8, NetLog::TYPE_PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
- EXPECT_TRUE(LogContainsEndEvent(
- entries, 9, NetLog::TYPE_PROXY_SCRIPT_DECIDER));
+ EXPECT_TRUE(
+ LogContainsEndEvent(entries, 9, NetLog::TYPE_PROXY_SCRIPT_DECIDER));
}
// Fails at WPAD (downloading), and fails at custom PAC (downloading).
@@ -531,9 +536,9 @@ TEST(ProxyScriptDeciderTest, AutodetectFailCustomFails1) {
TestCompletionCallback callback;
ProxyScriptDecider decider(&fetcher, &dhcp_fetcher, NULL);
- EXPECT_EQ(kFailedDownloading,
- decider.Start(config, base::TimeDelta(), true,
- callback.callback()));
+ EXPECT_EQ(
+ kFailedDownloading,
+ decider.Start(config, base::TimeDelta(), true, callback.callback()));
EXPECT_EQ(NULL, decider.script_data());
}
@@ -552,9 +557,9 @@ TEST(ProxyScriptDeciderTest, AutodetectFailCustomFails2) {
TestCompletionCallback callback;
ProxyScriptDecider decider(&fetcher, &dhcp_fetcher, NULL);
- EXPECT_EQ(kFailedParsing,
- decider.Start(config, base::TimeDelta(), true,
- callback.callback()));
+ EXPECT_EQ(
+ kFailedParsing,
+ decider.Start(config, base::TimeDelta(), true, callback.callback()));
EXPECT_EQ(NULL, decider.script_data());
}
@@ -575,8 +580,10 @@ TEST(ProxyScriptDeciderTest, CustomPacFails1_WithPositiveDelay) {
CapturingNetLog log;
ProxyScriptDecider decider(&fetcher, &dhcp_fetcher, &log);
EXPECT_EQ(ERR_IO_PENDING,
- decider.Start(config, base::TimeDelta::FromMilliseconds(1),
- true, callback.callback()));
+ decider.Start(config,
+ base::TimeDelta::FromMilliseconds(1),
+ true,
+ callback.callback()));
EXPECT_EQ(kFailedDownloading, callback.WaitForResult());
EXPECT_EQ(NULL, decider.script_data());
@@ -586,18 +593,18 @@ TEST(ProxyScriptDeciderTest, CustomPacFails1_WithPositiveDelay) {
log.GetEntries(&entries);
EXPECT_EQ(6u, entries.size());
- EXPECT_TRUE(LogContainsBeginEvent(
- entries, 0, NetLog::TYPE_PROXY_SCRIPT_DECIDER));
+ EXPECT_TRUE(
+ LogContainsBeginEvent(entries, 0, NetLog::TYPE_PROXY_SCRIPT_DECIDER));
EXPECT_TRUE(LogContainsBeginEvent(
entries, 1, NetLog::TYPE_PROXY_SCRIPT_DECIDER_WAIT));
- EXPECT_TRUE(LogContainsEndEvent(
- entries, 2, NetLog::TYPE_PROXY_SCRIPT_DECIDER_WAIT));
+ EXPECT_TRUE(
+ LogContainsEndEvent(entries, 2, NetLog::TYPE_PROXY_SCRIPT_DECIDER_WAIT));
EXPECT_TRUE(LogContainsBeginEvent(
entries, 3, NetLog::TYPE_PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
EXPECT_TRUE(LogContainsEndEvent(
entries, 4, NetLog::TYPE_PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
- EXPECT_TRUE(LogContainsEndEvent(
- entries, 5, NetLog::TYPE_PROXY_SCRIPT_DECIDER));
+ EXPECT_TRUE(
+ LogContainsEndEvent(entries, 5, NetLog::TYPE_PROXY_SCRIPT_DECIDER));
}
// This is a copy-paste of CustomPacFails1, with the exception that we give it
@@ -616,9 +623,10 @@ TEST(ProxyScriptDeciderTest, CustomPacFails1_WithNegativeDelay) {
TestCompletionCallback callback;
CapturingNetLog log;
ProxyScriptDecider decider(&fetcher, &dhcp_fetcher, &log);
- EXPECT_EQ(kFailedDownloading,
- decider.Start(config, base::TimeDelta::FromSeconds(-5),
- true, callback.callback()));
+ EXPECT_EQ(
+ kFailedDownloading,
+ decider.Start(
+ config, base::TimeDelta::FromSeconds(-5), true, callback.callback()));
EXPECT_EQ(NULL, decider.script_data());
// Check the NetLog was filled correctly.
@@ -626,21 +634,20 @@ TEST(ProxyScriptDeciderTest, CustomPacFails1_WithNegativeDelay) {
log.GetEntries(&entries);
EXPECT_EQ(4u, entries.size());
- EXPECT_TRUE(LogContainsBeginEvent(
- entries, 0, NetLog::TYPE_PROXY_SCRIPT_DECIDER));
+ EXPECT_TRUE(
+ LogContainsBeginEvent(entries, 0, NetLog::TYPE_PROXY_SCRIPT_DECIDER));
EXPECT_TRUE(LogContainsBeginEvent(
entries, 1, NetLog::TYPE_PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
EXPECT_TRUE(LogContainsEndEvent(
entries, 2, NetLog::TYPE_PROXY_SCRIPT_DECIDER_FETCH_PAC_SCRIPT));
- EXPECT_TRUE(LogContainsEndEvent(
- entries, 3, NetLog::TYPE_PROXY_SCRIPT_DECIDER));
+ EXPECT_TRUE(
+ LogContainsEndEvent(entries, 3, NetLog::TYPE_PROXY_SCRIPT_DECIDER));
}
class SynchronousSuccessDhcpFetcher : public DhcpProxyScriptFetcher {
public:
explicit SynchronousSuccessDhcpFetcher(const base::string16& expected_text)
- : gurl_("http://dhcppac/"), expected_text_(expected_text) {
- }
+ : gurl_("http://dhcppac/"), expected_text_(expected_text) {}
virtual int Fetch(base::string16* utf16_text,
const CompletionCallback& callback) OVERRIDE {
@@ -648,16 +655,11 @@ class SynchronousSuccessDhcpFetcher : public DhcpProxyScriptFetcher {
return OK;
}
- virtual void Cancel() OVERRIDE {
- }
+ virtual void Cancel() OVERRIDE {}
- virtual const GURL& GetPacURL() const OVERRIDE {
- return gurl_;
- }
+ virtual const GURL& GetPacURL() const OVERRIDE { return gurl_; }
- const base::string16& expected_text() const {
- return expected_text_;
- }
+ const base::string16& expected_text() const { return expected_text_; }
private:
GURL gurl_;
@@ -685,10 +687,9 @@ TEST(ProxyScriptDeciderTest, AutodetectDhcpSuccess) {
TestCompletionCallback callback;
ProxyScriptDecider decider(&fetcher, &dhcp_fetcher, NULL);
- EXPECT_EQ(OK, decider.Start(
- config, base::TimeDelta(), true, callback.callback()));
- EXPECT_EQ(dhcp_fetcher.expected_text(),
- decider.script_data()->utf16());
+ EXPECT_EQ(
+ OK, decider.Start(config, base::TimeDelta(), true, callback.callback()));
+ EXPECT_EQ(dhcp_fetcher.expected_text(), decider.script_data()->utf16());
EXPECT_TRUE(decider.effective_config().has_pac_url());
EXPECT_EQ(GURL("http://dhcppac/"), decider.effective_config().pac_url());
@@ -710,7 +711,8 @@ TEST(ProxyScriptDeciderTest, AutodetectDhcpFailParse) {
ProxyScriptDecider decider(&fetcher, &dhcp_fetcher, NULL);
// Since there is fallback to DNS-based WPAD, the final error will be that
// it failed downloading, not that it failed parsing.
- EXPECT_EQ(kFailedDownloading,
+ EXPECT_EQ(
+ kFailedDownloading,
decider.Start(config, base::TimeDelta(), true, callback.callback()));
EXPECT_EQ(NULL, decider.script_data());
@@ -733,13 +735,9 @@ class AsyncFailDhcpFetcher
return ERR_IO_PENDING;
}
- virtual void Cancel() OVERRIDE {
- callback_.Reset();
- }
+ virtual void Cancel() OVERRIDE { callback_.Reset(); }
- virtual const GURL& GetPacURL() const OVERRIDE {
- return dummy_gurl_;
- }
+ virtual const GURL& GetPacURL() const OVERRIDE { return dummy_gurl_; }
void CallbackWithFailure() {
if (!callback_.is_null())
« net/base/mime_util_unittest.cc ('K') | « net/proxy/proxy_script_decider.cc ('k') | net/proxy/proxy_script_fetcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698