Fix gcc 4.6 compile issues; set but unused variable and pointer/FALSE fubar.

chrome/browser/chromeos/cros/onc_network_parser_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/cros/onc_network_parser.h"
 
 #include <cert.h>
 #include <keyhi.h>
 #include <pk11pub.h>
 
@@ skipping 223 matching lines @@
   EXPECT_EQ(0, parser.GetCertificatesSize());
   scoped_ptr<Network> network(parser.ParseNetwork(0));
   ASSERT_TRUE(network.get());
 
   EXPECT_EQ(chromeos::TYPE_WIFI, network->type());
   WifiNetwork* wifi = static_cast<WifiNetwork*>(network.get());
   EXPECT_EQ(chromeos::SECURITY_WEP, wifi->encryption());
   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");
 }
 
 TEST_F(OncNetworkParserTest, TestCreateNetworkEthernet) {
   std::string test_blob;
   GetTestData("network-ethernet.onc", &test_blob);
   OncNetworkParser parser(test_blob, "", NetworkUIData::ONC_SOURCE_USER_IMPORT);
 
   EXPECT_GE(parser.GetNetworkConfigsSize(), 1);
@@ skipping 14 matching lines @@
   ASSERT_TRUE(parser.parse_error().empty());
   EXPECT_EQ(1, parser.GetNetworkConfigsSize());
   EXPECT_EQ(0, parser.GetCertificatesSize());
   scoped_ptr<Network> network(parser.ParseNetwork(0));
   ASSERT_TRUE(network.get());
 
   EXPECT_EQ(chromeos::TYPE_WIFI, network->type());
   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());
 }
 
 TEST_F(OncNetworkParserTest, TestLoadWifiCertificatePattern) {
   std::string test_blob;
   GetTestData("cert-pattern.onc", &test_blob);
   OncNetworkParser parser(test_blob, "", NetworkUIData::ONC_SOURCE_USER_IMPORT);
   ASSERT_TRUE(parser.parse_error().empty());
   EXPECT_EQ(1, parser.GetNetworkConfigsSize());
   EXPECT_EQ(2, parser.GetCertificatesSize());
   scoped_ptr<Network> network(parser.ParseNetwork(0));
   ASSERT_TRUE(network.get());
 
   EXPECT_EQ(chromeos::TYPE_WIFI, network->type());
   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());
   EXPECT_EQ("Google, Inc.",
             wifi->client_cert_pattern().issuer().organization());
   ASSERT_EQ(2ul, wifi->client_cert_pattern().enrollment_uri_list().size());
   EXPECT_EQ("http://youtu.be/dQw4w9WgXcQ",
             wifi->client_cert_pattern().enrollment_uri_list()[0]);
   EXPECT_EQ("chrome-extension://abc/keygen-cert.html",
             wifi->client_cert_pattern().enrollment_uri_list()[1]);
 }
 
 
 TEST_F(OncNetworkParserTest, TestLoadVPNCertificatePattern) {
   std::string test_blob;
   GetTestData("cert-pattern-vpn.onc", &test_blob);
   OncNetworkParser parser(test_blob, "", NetworkUIData::ONC_SOURCE_USER_IMPORT);
   ASSERT_TRUE(parser.parse_error().empty());
   EXPECT_EQ(1, parser.GetNetworkConfigsSize());
   EXPECT_EQ(2, parser.GetCertificatesSize());
   scoped_ptr<Network> network(parser.ParseNetwork(0));
   ASSERT_TRUE(network.get());
 
   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());
   ASSERT_EQ(2ul, vpn->client_cert_pattern().enrollment_uri_list().size());
   EXPECT_EQ("http://youtu.be/dQw4w9WgXcQ",
             vpn->client_cert_pattern().enrollment_uri_list()[0]);
   EXPECT_EQ("chrome-extension://abc/keygen-cert.html",
             vpn->client_cert_pattern().enrollment_uri_list()[1]);
 }
 
@@ skipping 10 matching lines @@
   EXPECT_EQ(chromeos::TYPE_WIFI, network->type());
   WifiNetwork* wifi = static_cast<WifiNetwork*>(network.get());
   EXPECT_EQ(chromeos::SECURITY_8021X, wifi->encryption());
   CheckStringProperty(wifi, PROPERTY_INDEX_SECURITY, flimflam::kSecurity8021x);
   EXPECT_EQ("ssid", wifi->name());
   EXPECT_EQ(true, wifi->auto_connect());
   CheckBooleanProperty(wifi, PROPERTY_INDEX_AUTO_CONNECT, true);
   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) {
   std::string test_blob;
   GetTestData("network-wifi-eap2.onc", &test_blob);
 
   OncNetworkParser parser(test_blob, "", NetworkUIData::ONC_SOURCE_USER_IMPORT);
 
   EXPECT_EQ(1, parser.GetNetworkConfigsSize());
   EXPECT_EQ(0, parser.GetCertificatesSize());
   scoped_ptr<Network> network(parser.ParseNetwork(0));
   ASSERT_TRUE(network.get());
 
   EXPECT_EQ(chromeos::TYPE_WIFI, network->type());
   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());
   CheckStringProperty(wifi, PROPERTY_INDEX_EAP_IDENTITY, "user");
   EXPECT_EQ("pass", wifi->eap_passphrase());
   CheckStringProperty(wifi, PROPERTY_INDEX_EAP_PASSWORD, "pass");
   EXPECT_EQ("anon", wifi->eap_anonymous_identity());
   CheckStringProperty(wifi, PROPERTY_INDEX_EAP_ANONYMOUS_IDENTITY, "anon");
 }
 
@@ skipping 550 matching lines @@
 
   EXPECT_EQ("a onc b",
             chromeos::OncNetworkParser::GetUserExpandedValue(
                 login_id_pattern, source));
   EXPECT_EQ("a onc@example.com b",
             chromeos::OncNetworkParser::GetUserExpandedValue(
                 login_email_pattern, source));
 }
 
 }  // namespace chromeos