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

Unified Diff: chrome/browser/chromeos/cros/onc_network_parser_unittest.cc

Issue 10444119: Fix gcc 4.6 compile issues; set but unused variable and pointer/FALSE fubar. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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
Index: chrome/browser/chromeos/cros/onc_network_parser_unittest.cc
diff --git a/chrome/browser/chromeos/cros/onc_network_parser_unittest.cc b/chrome/browser/chromeos/cros/onc_network_parser_unittest.cc
index f738a56479ce0fd5643529be5afea62ff9126095..55693c847e387a0560ad6f144b51f6c8d7d1f770 100644
--- a/chrome/browser/chromeos/cros/onc_network_parser_unittest.cc
+++ b/chrome/browser/chromeos/cros/onc_network_parser_unittest.cc
@@ -243,7 +243,7 @@ TEST_F(OncNetworkParserTest, TestCreateNetworkWifi) {
CheckStringProperty(wifi, PROPERTY_INDEX_SECURITY, flimflam::kSecurityWep);
EXPECT_EQ("ssid", wifi->name());
CheckStringProperty(wifi, PROPERTY_INDEX_SSID, "ssid");
- EXPECT_EQ(false, wifi->auto_connect());
+ EXPECT_FALSE(wifi->auto_connect());
EXPECT_EQ("0x1234567890", wifi->passphrase());
CheckStringProperty(wifi, PROPERTY_INDEX_PASSPHRASE, "0x1234567890");
}
@@ -278,7 +278,7 @@ TEST_F(OncNetworkParserTest, TestLoadEncryptedOnc) {
WifiNetwork* wifi = static_cast<WifiNetwork*>(network.get());
EXPECT_EQ(chromeos::SECURITY_NONE, wifi->encryption());
EXPECT_EQ("WirelessNetwork", wifi->name());
- EXPECT_EQ(false, wifi->auto_connect());
+ EXPECT_FALSE(wifi->auto_connect());
EXPECT_EQ("", wifi->passphrase());
}
@@ -296,7 +296,7 @@ TEST_F(OncNetworkParserTest, TestLoadWifiCertificatePattern) {
WifiNetwork* wifi = static_cast<WifiNetwork*>(network.get());
EXPECT_EQ(chromeos::SECURITY_8021X, wifi->encryption());
EXPECT_EQ("WirelessNetwork", wifi->name());
- EXPECT_EQ(false, wifi->auto_connect());
+ EXPECT_FALSE(wifi->auto_connect());
EXPECT_EQ("", wifi->passphrase());
EXPECT_EQ(chromeos::EAP_METHOD_TLS, wifi->eap_method());
EXPECT_EQ(chromeos::CLIENT_CERT_TYPE_PATTERN, wifi->client_cert_type());
@@ -323,7 +323,7 @@ TEST_F(OncNetworkParserTest, TestLoadVPNCertificatePattern) {
EXPECT_EQ(chromeos::TYPE_VPN, network->type());
VirtualNetwork* vpn = static_cast<VirtualNetwork*>(network.get());
EXPECT_EQ("MyVPN", vpn->name());
- EXPECT_EQ(false, vpn->auto_connect());
+ EXPECT_FALSE(vpn->auto_connect());
EXPECT_EQ(chromeos::CLIENT_CERT_TYPE_PATTERN, vpn->client_cert_type());
EXPECT_EQ("Google, Inc.",
vpn->client_cert_pattern().issuer().organization());
@@ -354,7 +354,7 @@ TEST_F(OncNetworkParserTest, TestCreateNetworkWifiEAP1) {
EXPECT_EQ(EAP_METHOD_PEAP, wifi->eap_method());
CheckStringProperty(wifi, PROPERTY_INDEX_EAP_METHOD,
flimflam::kEapMethodPEAP);
- EXPECT_EQ(false, wifi->eap_use_system_cas());
+ EXPECT_FALSE(wifi->eap_use_system_cas());
}
TEST_F(OncNetworkParserTest, TestCreateNetworkWifiEAP2) {
@@ -372,7 +372,7 @@ TEST_F(OncNetworkParserTest, TestCreateNetworkWifiEAP2) {
WifiNetwork* wifi = static_cast<WifiNetwork*>(network.get());
EXPECT_EQ(chromeos::SECURITY_8021X, wifi->encryption());
EXPECT_EQ("ssid", wifi->name());
- EXPECT_EQ(false, wifi->auto_connect());
+ EXPECT_FALSE(wifi->auto_connect());
EXPECT_EQ(EAP_METHOD_LEAP, wifi->eap_method());
EXPECT_EQ(true, wifi->eap_use_system_cas());
EXPECT_EQ("user", wifi->eap_identity());

Powered by Google App Engine
This is Rietveld 408576698