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

Unified Diff: net/proxy/dhcp_proxy_script_fetcher_factory_unittest.cc

Issue 7082004: Revert 86422 - Make DHCP WPAD on by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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
« no previous file with comments | « net/proxy/dhcp_proxy_script_fetcher_factory.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/dhcp_proxy_script_fetcher_factory_unittest.cc
diff --git a/net/proxy/dhcp_proxy_script_fetcher_factory_unittest.cc b/net/proxy/dhcp_proxy_script_fetcher_factory_unittest.cc
index e28cc192046b97bbc96fe3f4866e2c9708d2da63..902a41b2d02fc0c268ae232a1374decd11d0e455 100644
--- a/net/proxy/dhcp_proxy_script_fetcher_factory_unittest.cc
+++ b/net/proxy/dhcp_proxy_script_fetcher_factory_unittest.cc
@@ -5,14 +5,12 @@
#include "net/proxy/dhcp_proxy_script_fetcher.h"
#include "net/proxy/dhcp_proxy_script_fetcher_factory.h"
#include "net/url_request/url_request_test_util.h"
-#include "testing/gtest/include/gtest/gtest.h"
+#include "testing/gtest/include/gtest/gtest.h"
namespace net {
namespace {
-
TEST(DhcpProxyScriptFetcherFactoryTest, DoNothingWhenDisabled) {
DhcpProxyScriptFetcherFactory factory;
- factory.set_enabled(false);
scoped_ptr<DhcpProxyScriptFetcher> fetcher(factory.Create(NULL));
EXPECT_EQ("", fetcher->GetFetcherName());
}
@@ -38,11 +36,7 @@ TEST(DhcpProxyScriptFetcherFactoryTest, IsSupported) {
TEST(DhcpProxyScriptFetcherFactoryTest, SetEnabled) {
DhcpProxyScriptFetcherFactory factory;
-#if defined(OS_WIN)
- EXPECT_TRUE(factory.enabled());
-#else
EXPECT_FALSE(factory.enabled());
-#endif // defined(OS_WIN)
factory.set_enabled(false);
EXPECT_FALSE(factory.enabled());
« no previous file with comments | « net/proxy/dhcp_proxy_script_fetcher_factory.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698