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

Unified Diff: components/data_reduction_proxy/core/common/data_reduction_proxy_params_unittest.cc

Issue 1020863009: Revert of Add ClientConfig proto, and JSON generation/parsing. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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
Index: components/data_reduction_proxy/core/common/data_reduction_proxy_params_unittest.cc
diff --git a/components/data_reduction_proxy/core/common/data_reduction_proxy_params_unittest.cc b/components/data_reduction_proxy/core/common/data_reduction_proxy_params_unittest.cc
index aa5074125c123d1d839026bb3012dfde7aa97413..e2e8120cbff5d0573f403bce91cd25b5497c4b32 100644
--- a/components/data_reduction_proxy/core/common/data_reduction_proxy_params_unittest.cc
+++ b/components/data_reduction_proxy/core/common/data_reduction_proxy_params_unittest.cc
@@ -7,7 +7,6 @@
#include <map>
#include "base/command_line.h"
-#include "base/values.h"
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_params_test_utils.h"
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h"
#include "net/proxy/proxy_server.h"
@@ -767,30 +766,4 @@
"google/hammerhead/hammerhead:5.0/LRX210/1570415:user/release-keys"));
}
-TEST_F(DataReductionProxyParamsTest, PopulateConfigResponse) {
- DataReductionProxyParams params(
- DataReductionProxyParams::kAllowed |
- DataReductionProxyParams::kAlternativeAllowed);
- scoped_ptr<base::DictionaryValue> values(new base::DictionaryValue());
- params.PopulateConfigResponse(values.get());
- base::DictionaryValue* proxy_config;
- EXPECT_TRUE(values->GetDictionary("proxyConfig", &proxy_config));
- base::ListValue* proxy_servers;
- EXPECT_TRUE(proxy_config->GetList("httpProxyServers", &proxy_servers));
- EXPECT_TRUE(proxy_servers->GetSize() == 2);
- base::DictionaryValue* server;
- EXPECT_TRUE(proxy_servers->GetDictionary(0, &server));
- std::string host;
- int port;
- EXPECT_TRUE(server->GetString("host", &host));
- EXPECT_TRUE(server->GetInteger("port", &port));
- EXPECT_EQ(params.origin().host_port_pair().host(), host);
- EXPECT_EQ(params.origin().host_port_pair().port(), port);
- EXPECT_TRUE(proxy_servers->GetDictionary(1, &server));
- EXPECT_TRUE(server->GetString("host", &host));
- EXPECT_TRUE(server->GetInteger("port", &port));
- EXPECT_EQ(params.fallback_origin().host_port_pair().host(), host);
- EXPECT_EQ(params.fallback_origin().host_port_pair().port(), port);
-}
-
} // namespace data_reduction_proxy

Powered by Google App Engine
This is Rietveld 408576698