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

BUG=none


Review URL: https://chromiumcodereview.appspot.com/10444119

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140019 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 13 insertions, 12 deletions

diff --git a/chrome/browser/chromeos/cros/onc_network_parser_unittest.cc b/chrome/browser/chromeos/cros/onc_network_parser_unittest.cc
index 2166689..13a4e92 100644
--- a/chrome/browser/chromeos/cros/onc_network_parser_unittest.cc
+++ b/chrome/browser/chromeos/cros/onc_network_parser_unittest.cc
@@ -241,7 +241,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");
 }
@@ -276,7 +276,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());
 }
 
@@ -294,7 +294,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());
@@ -321,7 +321,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());
@@ -352,7 +352,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) {
@@ -370,7 +370,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());
diff --git a/chrome/browser/chromeos/external_metrics_unittest.cc b/chrome/browser/chromeos/external_metrics_unittest.cc
index 9f69b91..d1ff75d 100644
--- a/chrome/browser/chromeos/external_metrics_unittest.cc
+++ b/chrome/browser/chromeos/external_metrics_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -24,10 +24,11 @@ class ExternalMetricsTest : public testing::Test {
 static void SendMessage(const char* path, const char* name, const char* value) {
   int fd = open(path, O_CREAT | O_APPEND | O_WRONLY, 0666);
   int32 l = strlen(name) + strlen(value) + 2 + sizeof(l);
-  int num_bytes;
-  num_bytes = write(fd, &l, sizeof(l));
-  num_bytes = write(fd, name, strlen(name) + 1);
-  num_bytes = write(fd, value, strlen(value) + 1);
+  size_t num_bytes = 0;
+  num_bytes += write(fd, &l, sizeof(l));
+  num_bytes += write(fd, name, strlen(name) + 1);
+  num_bytes += write(fd, value, strlen(value) + 1);
+  EXPECT_EQ(num_bytes, sizeof(l) + strlen(name) + strlen(value) + 2);
   close(fd);
 }
 
diff --git a/chrome/browser/chromeos/mobile_config_unittest.cc b/chrome/browser/chromeos/mobile_config_unittest.cc
index 5f81513..ae7be05 100644
--- a/chrome/browser/chromeos/mobile_config_unittest.cc
+++ b/chrome/browser/chromeos/mobile_config_unittest.cc
@@ -169,7 +169,7 @@ TEST(MobileConfigTest, OldDeal) {
   carrier = config.GetCarrier("Carrier (country)");
   EXPECT_TRUE(carrier != NULL);
   // Check default value.
-  EXPECT_EQ(false, carrier->show_portal_button());
+  EXPECT_FALSE(carrier->show_portal_button());
   const MobileConfig::CarrierDeal* deal;
   // TODO(nkostylev): Pass fixed time instead of relying on Time::Now().
   deal = carrier->GetDefaultDeal();