Small fixes to allow unit tests to compile with gcc 4.7.x (tested with gcc 4.7.2)

base/pickle_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 <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/pickle.h"
 #include "base/string16.h"
@@ skipping 22 matching lines @@
   std::string outstr;
   EXPECT_TRUE(pickle.ReadString(&iter, &outstr));
   EXPECT_EQ(teststr, outstr);
 
   std::wstring outwstr;
   EXPECT_TRUE(pickle.ReadWString(&iter, &outwstr));
   EXPECT_EQ(testwstr, outwstr);
 
   bool outbool;
   EXPECT_TRUE(pickle.ReadBool(&iter, &outbool));
-  EXPECT_EQ(testbool1, outbool);
+  EXPECT_FALSE(outbool);
   EXPECT_TRUE(pickle.ReadBool(&iter, &outbool));
-  EXPECT_EQ(testbool2, outbool);
+  EXPECT_TRUE(outbool);
 
   uint16 outuint16;
   EXPECT_TRUE(pickle.ReadUInt16(&iter, &outuint16));
   EXPECT_EQ(testuint16, outuint16);
 
   float outfloat;
   EXPECT_TRUE(pickle.ReadFloat(&iter, &outfloat));
   EXPECT_EQ(testfloat, outfloat);
 
   const char* outdata;
@@ skipping 277 matching lines @@
   EXPECT_TRUE(pickle.WriteBytes(&data, sizeof(data)));
 
   PickleIterator iter(pickle);
   const char* outdata_char = NULL;
   EXPECT_TRUE(pickle.ReadBytes(&iter, &outdata_char, sizeof(data)));
 
   int outdata;
   memcpy(&outdata, outdata_char, sizeof(outdata));
   EXPECT_EQ(data, outdata);
 }