diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-20 22:45:00 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-20 22:45:00 +0000 |
| commit | 259aefa98c9947620e651ba1a220dbeb0df48b21 (patch) | |
| tree | ee1184df026636acad392cc2be2972c6730f3886 /net/proxy/init_proxy_resolver_unittest.cc | |
| parent | 4dc37d9532eff13c23c39f10f8876fa40bb88b48 (diff) | |
| download | chromium_src-259aefa98c9947620e651ba1a220dbeb0df48b21.zip chromium_src-259aefa98c9947620e651ba1a220dbeb0df48b21.tar.gz chromium_src-259aefa98c9947620e651ba1a220dbeb0df48b21.tar.bz2 | |
Fix some style nits in unittests.
* Changed the indentation for long lines of "ExpectLogContains()".
* Moved host_resolver_impl_unittest into the net namespace to avoid lots of redundant net:: prefixes.
Review URL: http://codereview.chromium.org/173137
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23902 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/init_proxy_resolver_unittest.cc')
| -rw-r--r-- | net/proxy/init_proxy_resolver_unittest.cc | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/net/proxy/init_proxy_resolver_unittest.cc b/net/proxy/init_proxy_resolver_unittest.cc index c1e45a8..b179ad1 100644 --- a/net/proxy/init_proxy_resolver_unittest.cc +++ b/net/proxy/init_proxy_resolver_unittest.cc @@ -178,17 +178,17 @@ TEST(InitProxyResolverTest, CustomPacSucceeds) { // Check the LoadLog was filled correctly. EXPECT_EQ(6u, log->events().size()); ExpectLogContains(log, 0, LoadLog::TYPE_INIT_PROXY_RESOLVER, - LoadLog::PHASE_BEGIN); + LoadLog::PHASE_BEGIN); ExpectLogContains(log, 1, LoadLog::TYPE_INIT_PROXY_RESOLVER_FETCH_PAC_SCRIPT, - LoadLog::PHASE_BEGIN); + LoadLog::PHASE_BEGIN); ExpectLogContains(log, 2, LoadLog::TYPE_INIT_PROXY_RESOLVER_FETCH_PAC_SCRIPT, - LoadLog::PHASE_END); + LoadLog::PHASE_END); ExpectLogContains(log, 3, LoadLog::TYPE_INIT_PROXY_RESOLVER_SET_PAC_SCRIPT, - LoadLog::PHASE_BEGIN); + LoadLog::PHASE_BEGIN); ExpectLogContains(log, 4, LoadLog::TYPE_INIT_PROXY_RESOLVER_SET_PAC_SCRIPT, - LoadLog::PHASE_END); + LoadLog::PHASE_END); ExpectLogContains(log, 5, LoadLog::TYPE_INIT_PROXY_RESOLVER, - LoadLog::PHASE_END); + LoadLog::PHASE_END); } // Fail downloading the custom PAC script. @@ -211,13 +211,13 @@ TEST(InitProxyResolverTest, CustomPacFails1) { // Check the LoadLog was filled correctly. EXPECT_EQ(4u, log->events().size()); ExpectLogContains(log, 0, LoadLog::TYPE_INIT_PROXY_RESOLVER, - LoadLog::PHASE_BEGIN); + LoadLog::PHASE_BEGIN); ExpectLogContains(log, 1, LoadLog::TYPE_INIT_PROXY_RESOLVER_FETCH_PAC_SCRIPT, - LoadLog::PHASE_BEGIN); + LoadLog::PHASE_BEGIN); ExpectLogContains(log, 2, LoadLog::TYPE_INIT_PROXY_RESOLVER_FETCH_PAC_SCRIPT, - LoadLog::PHASE_END); + LoadLog::PHASE_END); ExpectLogContains(log, 3, LoadLog::TYPE_INIT_PROXY_RESOLVER, - LoadLog::PHASE_END); + LoadLog::PHASE_END); } // Fail parsing the custom PAC script. @@ -297,25 +297,25 @@ TEST(InitProxyResolverTest, AutodetectFailCustomSuccess2) { // PAC scripts are tried). EXPECT_EQ(10u, log->events().size()); ExpectLogContains(log, 0, LoadLog::TYPE_INIT_PROXY_RESOLVER, - LoadLog::PHASE_BEGIN); + LoadLog::PHASE_BEGIN); ExpectLogContains(log, 1, LoadLog::TYPE_INIT_PROXY_RESOLVER_FETCH_PAC_SCRIPT, - LoadLog::PHASE_BEGIN); + LoadLog::PHASE_BEGIN); ExpectLogContains(log, 2, LoadLog::TYPE_INIT_PROXY_RESOLVER_FETCH_PAC_SCRIPT, - LoadLog::PHASE_END); + LoadLog::PHASE_END); ExpectLogContains(log, 3, LoadLog::TYPE_INIT_PROXY_RESOLVER_SET_PAC_SCRIPT, - LoadLog::PHASE_BEGIN); + LoadLog::PHASE_BEGIN); ExpectLogContains(log, 4, LoadLog::TYPE_INIT_PROXY_RESOLVER_SET_PAC_SCRIPT, - LoadLog::PHASE_END); + LoadLog::PHASE_END); ExpectLogContains(log, 5, LoadLog::TYPE_INIT_PROXY_RESOLVER_FETCH_PAC_SCRIPT, - LoadLog::PHASE_BEGIN); + LoadLog::PHASE_BEGIN); ExpectLogContains(log, 6, LoadLog::TYPE_INIT_PROXY_RESOLVER_FETCH_PAC_SCRIPT, - LoadLog::PHASE_END); + LoadLog::PHASE_END); ExpectLogContains(log, 7, LoadLog::TYPE_INIT_PROXY_RESOLVER_SET_PAC_SCRIPT, - LoadLog::PHASE_BEGIN); + LoadLog::PHASE_BEGIN); ExpectLogContains(log, 8, LoadLog::TYPE_INIT_PROXY_RESOLVER_SET_PAC_SCRIPT, - LoadLog::PHASE_END); + LoadLog::PHASE_END); ExpectLogContains(log, 9, LoadLog::TYPE_INIT_PROXY_RESOLVER, - LoadLog::PHASE_END); + LoadLog::PHASE_END); } // Fails at WPAD (downloading), and fails at custom PAC (downloading). |