Use gcc 4.2 for the Mac build. Fix up new warnings and errors pointed out

by gcc 4.2:
warning: 'C' has a field 'C::m_' whose type uses the anonymous namespace
warning: missing braces around initializer for 'S'
error: extra qualification 'C::' on member 'm'
Review URL: http://codereview.chromium.org/1675

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

11 files changed, 60 insertions, 64 deletions

diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc
index 3ebda65..a93eda3 100644
--- a/base/file_util_unittest.cc
+++ b/base/file_util_unittest.cc
@@ -132,8 +132,6 @@ const struct append_case {
 #endif
 };
 
-}  // namespace
-
 TEST_F(FileUtilTest, AppendToPath) {
   for (unsigned int i = 0; i < arraysize(append_cases); ++i) {
     const append_case& value = append_cases[i];
@@ -889,3 +887,4 @@ TEST_F(FileUtilTest, FileEnumeratorTest) {
                                     // (we don't care what).
 }
 
+}  // namespace
diff --git a/base/gfx/platform_device_mac.cc b/base/gfx/platform_device_mac.cc
index 6c8b0da..9185dae 100755
--- a/base/gfx/platform_device_mac.cc
+++ b/base/gfx/platform_device_mac.cc
@@ -57,7 +57,7 @@ void PlatformDeviceMac::LoadPathToCGContext(CGContextRef context,
   // type per call, so we just have to load up the geometry.
   CGContextBeginPath(context);
 
-  SkPoint points[4] = {0};
+  SkPoint points[4] = { {0, 0}, {0, 0}, {0, 0}, {0, 0} };
   SkPath::Iter iter(path, false);
   for (SkPath::Verb verb = iter.next(points); verb != SkPath::kDone_Verb;
        verb = iter.next(points)) {
diff --git a/base/pr_time_unittest.cc b/base/pr_time_unittest.cc
index aad0ccb..38c3140 100644
--- a/base/pr_time_unittest.cc
+++ b/base/pr_time_unittest.cc
@@ -42,8 +42,6 @@ class PRTimeTest : public testing::Test {
   PRTime comparison_time_local_;
 };
 
-}  // namespace
-
 // Tests the PR_ParseTimeString nspr helper function for
 // a variety of time strings.
 TEST_F(PRTimeTest, ParseTimeTest1) {
@@ -238,3 +236,4 @@ TEST_F(PRTimeTest, ParseTimeTestEmpty) {
   EXPECT_FALSE(Time::FromString(L"", &parsed_time));
 }
 
+}  // namespace
diff --git a/base/stats_table.cc b/base/stats_table.cc
index ba08f1c..14e4a89 100644
--- a/base/stats_table.cc
+++ b/base/stats_table.cc
@@ -70,14 +70,6 @@ const int kTableVersion = 0x13131313;
 // The name for un-named counters and threads in the table.
 const wchar_t kUnknownName[] = L"<unknown>";
 
-// Various header information contained in the memory mapped segment.
-struct TableHeader {
-  int version;
-  int size;
-  int max_counters;
-  int max_threads;
-};
-
 // Calculates delta to align an offset to the size of an int
 inline int AlignOffset(int offset) {
   return (sizeof(int) - (offset % sizeof(int))) % sizeof(int);
@@ -115,6 +107,14 @@ static void SlotReturnFunction(void* data) {
 // clean and accessible.
 class StatsTablePrivate {
  public:
+  // Various header information contained in the memory mapped segment.
+  struct TableHeader {
+    int version;
+    int size;
+    int max_counters;
+    int max_threads;
+  };
+
   // Create the StatsTablePrivate based on expected size parameters.
   StatsTablePrivate(void* memory, int size, int max_threads, int max_counters);
 
@@ -231,7 +231,7 @@ StatsTable::StatsTable(const std::wstring& name, int max_threads,
                        int max_counters)
     : tls_index_(SlotReturnFunction) {
   int table_size =
-    AlignedSize(sizeof(TableHeader)) +
+    AlignedSize(sizeof(StatsTablePrivate::TableHeader)) +
     AlignedSize((max_counters * sizeof(wchar_t) * kMaxCounterNameLength)) +
     AlignedSize((max_threads * sizeof(wchar_t) * kMaxThreadNameLength)) +
     AlignedSize(max_threads * sizeof(int)) +
diff --git a/build/common.xcconfig b/build/common.xcconfig
index 5274cef..4f4cab7 100644
--- a/build/common.xcconfig
+++ b/build/common.xcconfig
@@ -11,6 +11,7 @@ GCC_INLINES_ARE_PRIVATE_EXTERN = YES
 GCC_PRECOMPILE_PREFIX_HEADER = YES
 GCC_SYMBOLS_PRIVATE_EXTERN = YES
 GCC_TREAT_WARNINGS_AS_ERRORS = YES
+GCC_VERSION = 4.2
 GCC_WARN_ABOUT_MISSING_NEWLINE = YES
 OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(CODECOVERAGE_OTHER_LDFLAGS)
 PREBINDING = NO
diff --git a/net/base/bzip2_filter_unittest.cc b/net/base/bzip2_filter_unittest.cc
index 85d4a5b..c3a65a5 100644
--- a/net/base/bzip2_filter_unittest.cc
+++ b/net/base/bzip2_filter_unittest.cc
@@ -177,8 +177,6 @@ class BZip2FilterUnitTest : public PlatformTest {
   int bzip2_encode_len_;
 };
 
-}  // namespace
-
 // Basic scenario: decoding bzip2 data with big enough buffer.
 TEST_F(BZip2FilterUnitTest, DecodeBZip2) {
   // Decode the compressed data with filter
@@ -374,3 +372,4 @@ TEST_F(BZip2FilterUnitTest, DecodeWithExtraDataAndSmallInputBuffer) {
                              true);
 }
 
+}  // namespace
diff --git a/net/base/ev_root_ca_metadata.cc b/net/base/ev_root_ca_metadata.cc
index d278016..03caa4e 100644
--- a/net/base/ev_root_ca_metadata.cc
+++ b/net/base/ev_root_ca_metadata.cc
@@ -22,122 +22,122 @@ struct EVMetadata {
 static const EVMetadata ev_root_ca_metadata[] = {
   // COMODO Certification Authority
   // https://secure.comodo.com/
-  { { 0x66, 0x31, 0xbf, 0x9e, 0xf7, 0x4f, 0x9e, 0xb6, 0xc9, 0xd5,
-      0xa6, 0x0c, 0xba, 0x6a, 0xbe, 0xd1, 0xf7, 0xbd, 0xef, 0x7b },
+  { { { 0x66, 0x31, 0xbf, 0x9e, 0xf7, 0x4f, 0x9e, 0xb6, 0xc9, 0xd5,
+        0xa6, 0x0c, 0xba, 0x6a, 0xbe, 0xd1, 0xf7, 0xbd, 0xef, 0x7b } },
     "1.3.6.1.4.1.6449.1.2.1.5.1"
   },
   // DigiCert High Assurance EV Root CA
   // https://www.digicert.com
-  { { 0x5f, 0xb7, 0xee, 0x06, 0x33, 0xe2, 0x59, 0xdb, 0xad, 0x0c,
-      0x4c, 0x9a, 0xe6, 0xd3, 0x8f, 0x1a, 0x61, 0xc7, 0xdc, 0x25 },
+  { { { 0x5f, 0xb7, 0xee, 0x06, 0x33, 0xe2, 0x59, 0xdb, 0xad, 0x0c,
+        0x4c, 0x9a, 0xe6, 0xd3, 0x8f, 0x1a, 0x61, 0xc7, 0xdc, 0x25 } },
     "2.16.840.1.114412.2.1"
   },
   // Entrust.net Secure Server Certification Authority
   // https://www.entrust.net/
-  { { 0x99, 0xa6, 0x9b, 0xe6, 0x1a, 0xfe, 0x88, 0x6b, 0x4d, 0x2b,
-      0x82, 0x00, 0x7c, 0xb8, 0x54, 0xfc, 0x31, 0x7e, 0x15, 0x39 },
+  { { { 0x99, 0xa6, 0x9b, 0xe6, 0x1a, 0xfe, 0x88, 0x6b, 0x4d, 0x2b,
+        0x82, 0x00, 0x7c, 0xb8, 0x54, 0xfc, 0x31, 0x7e, 0x15, 0x39 } },
     "2.16.840.1.114028.10.1.2"
   },
   // Entrust Root Certification Authority
   // https://www.entrust.net/
-  { { 0xb3, 0x1e, 0xb1, 0xb7, 0x40, 0xe3, 0x6c, 0x84, 0x02, 0xda,
-      0xdc, 0x37, 0xd4, 0x4d, 0xf5, 0xd4, 0x67, 0x49, 0x52, 0xf9 },
+  { { { 0xb3, 0x1e, 0xb1, 0xb7, 0x40, 0xe3, 0x6c, 0x84, 0x02, 0xda,
+        0xdc, 0x37, 0xd4, 0x4d, 0xf5, 0xd4, 0x67, 0x49, 0x52, 0xf9 } },
     "2.16.840.1.114028.10.1.2"
   },
   // Equifax Secure Certificate Authority (GeoTrust)
   // https://www.geotrust.com/
-  { { 0xd2, 0x32, 0x09, 0xad, 0x23, 0xd3, 0x14, 0x23, 0x21, 0x74,
-      0xe4, 0x0d, 0x7f, 0x9d, 0x62, 0x13, 0x97, 0x86, 0x63, 0x3a },
+  { { { 0xd2, 0x32, 0x09, 0xad, 0x23, 0xd3, 0x14, 0x23, 0x21, 0x74,
+        0xe4, 0x0d, 0x7f, 0x9d, 0x62, 0x13, 0x97, 0x86, 0x63, 0x3a } },
     "1.3.6.1.4.1.14370.1.6"
   },
   // GeoTrust Primary Certification Authority
   // https://www.geotrust.com/
-  { { 0x32, 0x3c, 0x11, 0x8e, 0x1b, 0xf7, 0xb8, 0xb6, 0x52, 0x54,
-      0xe2, 0xe2, 0x10, 0x0d, 0xd6, 0x02, 0x90, 0x37, 0xf0, 0x96 },
+  { { { 0x32, 0x3c, 0x11, 0x8e, 0x1b, 0xf7, 0xb8, 0xb6, 0x52, 0x54,
+        0xe2, 0xe2, 0x10, 0x0d, 0xd6, 0x02, 0x90, 0x37, 0xf0, 0x96 } },
     "1.3.6.1.4.1.14370.1.6"
   },
   // Go Daddy Class 2 Certification Authority
   // https://www.godaddy.com/
-  { { 0x27, 0x96, 0xba, 0xe6, 0x3f, 0x18, 0x01, 0xe2, 0x77, 0x26,
-      0x1b, 0xa0, 0xd7, 0x77, 0x70, 0x02, 0x8f, 0x20, 0xee, 0xe4 },
+  { { { 0x27, 0x96, 0xba, 0xe6, 0x3f, 0x18, 0x01, 0xe2, 0x77, 0x26,
+        0x1b, 0xa0, 0xd7, 0x77, 0x70, 0x02, 0x8f, 0x20, 0xee, 0xe4 } },
     "2.16.840.1.114413.1.7.23.3"
   },
   //  Network Solutions Certificate Authority
   //  https://www.networksolutions.com/website-packages/index.jsp
-  { { 0x74, 0xf8, 0xa3, 0xc3, 0xef, 0xe7, 0xb3, 0x90, 0x06, 0x4b,
-      0x83, 0x90, 0x3c, 0x21, 0x64, 0x60, 0x20, 0xe5, 0xdf, 0xce },
+  { { { 0x74, 0xf8, 0xa3, 0xc3, 0xef, 0xe7, 0xb3, 0x90, 0x06, 0x4b,
+        0x83, 0x90, 0x3c, 0x21, 0x64, 0x60, 0x20, 0xe5, 0xdf, 0xce } },
     "1.3.6.1.4.1.782.1.2.1.8.1"
   },
   // QuoVadis Root CA 2
   // https://www.quovadis.bm/
-  { { 0xca, 0x3a, 0xfb, 0xcf, 0x12, 0x40, 0x36, 0x4b, 0x44, 0xb2,
-      0x16, 0x20, 0x88, 0x80, 0x48, 0x39, 0x19, 0x93, 0x7c, 0xf7 },
+  { { { 0xca, 0x3a, 0xfb, 0xcf, 0x12, 0x40, 0x36, 0x4b, 0x44, 0xb2,
+        0x16, 0x20, 0x88, 0x80, 0x48, 0x39, 0x19, 0x93, 0x7c, 0xf7 } },
     "1.3.6.1.4.1.8024.0.2.100.1.2"
   },
   // SecureTrust CA, SecureTrust Corporation
   // https://www.securetrust.com
   // https://www.trustwave.com/
-  { { 0x87, 0x82, 0xc6, 0xc3, 0x04, 0x35, 0x3b, 0xcf, 0xd2, 0x96,
-      0x92, 0xd2, 0x59, 0x3e, 0x7d, 0x44, 0xd9, 0x34, 0xff, 0x11 },
+  { { { 0x87, 0x82, 0xc6, 0xc3, 0x04, 0x35, 0x3b, 0xcf, 0xd2, 0x96,
+        0x92, 0xd2, 0x59, 0x3e, 0x7d, 0x44, 0xd9, 0x34, 0xff, 0x11 } },
     "2.16.840.1.114404.1.1.2.4.1"
   },
   // Secure Global CA, SecureTrust Corporation
-  { { 0x3a, 0x44, 0x73, 0x5a, 0xe5, 0x81, 0x90, 0x1f, 0x24, 0x86,
-      0x61, 0x46, 0x1e, 0x3b, 0x9c, 0xc4, 0x5f, 0xf5, 0x3a, 0x1b },
+  { { { 0x3a, 0x44, 0x73, 0x5a, 0xe5, 0x81, 0x90, 0x1f, 0x24, 0x86,
+        0x61, 0x46, 0x1e, 0x3b, 0x9c, 0xc4, 0x5f, 0xf5, 0x3a, 0x1b } },
     "2.16.840.1.114404.1.1.2.4.1"
   },
   // Starfield Class 2 Certification Authority
   // https://www.starfieldtech.com/
-  { { 0xad, 0x7e, 0x1c, 0x28, 0xb0, 0x64, 0xef, 0x8f, 0x60, 0x03,
-      0x40, 0x20, 0x14, 0xc3, 0xd0, 0xe3, 0x37, 0x0e, 0xb5, 0x8a },
+  { { { 0xad, 0x7e, 0x1c, 0x28, 0xb0, 0x64, 0xef, 0x8f, 0x60, 0x03,
+        0x40, 0x20, 0x14, 0xc3, 0xd0, 0xe3, 0x37, 0x0e, 0xb5, 0x8a } },
     "2.16.840.1.114414.1.7.23.3"
   },
   // Thawte Premium Server CA
   // https://www.thawte.com/
-  { { 0x62, 0x7f, 0x8d, 0x78, 0x27, 0x65, 0x63, 0x99, 0xd2, 0x7d,
-      0x7f, 0x90, 0x44, 0xc9, 0xfe, 0xb3, 0xf3, 0x3e, 0xfa, 0x9a },
+  { { { 0x62, 0x7f, 0x8d, 0x78, 0x27, 0x65, 0x63, 0x99, 0xd2, 0x7d,
+        0x7f, 0x90, 0x44, 0xc9, 0xfe, 0xb3, 0xf3, 0x3e, 0xfa, 0x9a } },
     "2.16.840.1.113733.1.7.48.1"
   },
   // thawte Primary Root CA
   // https://www.thawte.com/
-  { { 0x91, 0xc6, 0xd6, 0xee, 0x3e, 0x8a, 0xc8, 0x63, 0x84, 0xe5,
-      0x48, 0xc2, 0x99, 0x29, 0x5c, 0x75, 0x6c, 0x81, 0x7b, 0x81 },
+  { { { 0x91, 0xc6, 0xd6, 0xee, 0x3e, 0x8a, 0xc8, 0x63, 0x84, 0xe5,
+        0x48, 0xc2, 0x99, 0x29, 0x5c, 0x75, 0x6c, 0x81, 0x7b, 0x81 } },
     "2.16.840.1.113733.1.7.48.1"
   },
   // UTN - DATACorp SGC
-  { { 0x58, 0x11, 0x9f, 0x0e, 0x12, 0x82, 0x87, 0xea, 0x50, 0xfd,
-      0xd9, 0x87, 0x45, 0x6f, 0x4f, 0x78, 0xdc, 0xfa, 0xd6, 0xd4 },
+  { { { 0x58, 0x11, 0x9f, 0x0e, 0x12, 0x82, 0x87, 0xea, 0x50, 0xfd,
+        0xd9, 0x87, 0x45, 0x6f, 0x4f, 0x78, 0xdc, 0xfa, 0xd6, 0xd4 } },
     "1.3.6.1.4.1.6449.1.2.1.5.1"
   },
   // UTN-USERFirst-Hardware
-  { { 0x04, 0x83, 0xed, 0x33, 0x99, 0xac, 0x36, 0x08, 0x05, 0x87,
-      0x22, 0xed, 0xbc, 0x5e, 0x46, 0x00, 0xe3, 0xbe, 0xf9, 0xd7 },
+  { { { 0x04, 0x83, 0xed, 0x33, 0x99, 0xac, 0x36, 0x08, 0x05, 0x87,
+        0x22, 0xed, 0xbc, 0x5e, 0x46, 0x00, 0xe3, 0xbe, 0xf9, 0xd7 } },
     "1.3.6.1.4.1.6449.1.2.1.5.1"
   },
   // ValiCert Class 2 Policy Validation Authority
   // TODO(wtc): bug 1165107: this CA has another policy OID
   // "2.16.840.1.114414.1.7.23.3".
-  { { 0x31, 0x7a, 0x2a, 0xd0, 0x7f, 0x2b, 0x33, 0x5e, 0xf5, 0xa1,
-      0xc3, 0x4e, 0x4b, 0x57, 0xe8, 0xb7, 0xd8, 0xf1, 0xfc, 0xa6 },
+  { { { 0x31, 0x7a, 0x2a, 0xd0, 0x7f, 0x2b, 0x33, 0x5e, 0xf5, 0xa1,
+        0xc3, 0x4e, 0x4b, 0x57, 0xe8, 0xb7, 0xd8, 0xf1, 0xfc, 0xa6 } },
     "2.16.840.1.114413.1.7.23.3"
   },
   // VeriSign Class 3 Public Primary Certification Authority
   // https://www.verisign.com/
-  { { 0x74, 0x2c, 0x31, 0x92, 0xe6, 0x07, 0xe4, 0x24, 0xeb, 0x45,
-      0x49, 0x54, 0x2b, 0xe1, 0xbb, 0xc5, 0x3e, 0x61, 0x74, 0xe2 },
+  { { { 0x74, 0x2c, 0x31, 0x92, 0xe6, 0x07, 0xe4, 0x24, 0xeb, 0x45,
+        0x49, 0x54, 0x2b, 0xe1, 0xbb, 0xc5, 0x3e, 0x61, 0x74, 0xe2 } },
     "2.16.840.1.113733.1.7.23.6"
   },
   // VeriSign Class 3 Public Primary Certification Authority - G5
   // https://www.verisign.com/
-  { { 0x4e, 0xb6, 0xd5, 0x78, 0x49, 0x9b, 0x1c, 0xcf, 0x5f, 0x58,
-      0x1e, 0xad, 0x56, 0xbe, 0x3d, 0x9b, 0x67, 0x44, 0xa5, 0xe5 },
+  { { { 0x4e, 0xb6, 0xd5, 0x78, 0x49, 0x9b, 0x1c, 0xcf, 0x5f, 0x58,
+        0x1e, 0xad, 0x56, 0xbe, 0x3d, 0x9b, 0x67, 0x44, 0xa5, 0xe5 } },
     "2.16.840.1.113733.1.7.23.6"
   },
   // XRamp Global Certification Authority
-  { { 0xb8, 0x01, 0x86, 0xd1, 0xeb, 0x9c, 0x86, 0xa5, 0x41, 0x04,
-      0xcf, 0x30, 0x54, 0xf3, 0x4c, 0x52, 0xb7, 0xe5, 0x58, 0xc6 },
+  { { { 0xb8, 0x01, 0x86, 0xd1, 0xeb, 0x9c, 0x86, 0xa5, 0x41, 0x04,
+        0xcf, 0x30, 0x54, 0xf3, 0x4c, 0x52, 0xb7, 0xe5, 0x58, 0xc6 } },
     "2.16.840.1.114404.1.1.2.4.1"
-  },
+  }
 };
 
 // static
diff --git a/net/base/gzip_filter_unittest.cc b/net/base/gzip_filter_unittest.cc
index a0d3707..57ec648 100644
--- a/net/base/gzip_filter_unittest.cc
+++ b/net/base/gzip_filter_unittest.cc
@@ -225,8 +225,6 @@ class GZipUnitTest : public PlatformTest {
   int gzip_encode_len_;
 };
 
-}  // namespace
-
 // Basic scenario: decoding deflate data with big enough buffer.
 TEST_F(GZipUnitTest, DecodeDeflate) {
   // Decode the compressed data with filter
@@ -397,3 +395,4 @@ TEST_F(GZipUnitTest, ApacheWorkaround) {
   EXPECT_FALSE(filter.get());
 }
 
+}  // namespace
diff --git a/net/base/registry_controlled_domain_unittest.cc b/net/base/registry_controlled_domain_unittest.cc
index 220305f..b723999 100644
--- a/net/base/registry_controlled_domain_unittest.cc
+++ b/net/base/registry_controlled_domain_unittest.cc
@@ -72,8 +72,6 @@ bool CompareDomains(const std::string& url1, const std::string& url2) {
   return TestRegistryControlledDomainService::SameDomainOrHost(g1, g2);
 }
 
-} // namespace
-
 TEST_F(RegistryControlledDomainTest, TestParsing) {
   // Ensure that various simple and pathological cases parse without hanging or
   // crashing.  Testing the correctness of the parsing directly would require
@@ -276,3 +274,4 @@ TEST_F(RegistryControlledDomainTest, TestDefaultData) {
   EXPECT_EQ(3U, GetRegistryLengthFromURL("http://nowhere.foo", true));
 }
 
+} // namespace
diff --git a/net/disk_cache/trace.cc b/net/disk_cache/trace.cc
index 3aba306..02d5ceb 100644
--- a/net/disk_cache/trace.cc
+++ b/net/disk_cache/trace.cc
@@ -30,8 +30,6 @@ struct TraceBuffer {
   char buffer[kNumberOfEntries][kEntrySize];
 };
 
-TraceBuffer* s_trace_buffer = NULL;
-
 void DebugOutput(const char* msg) {
 #if defined(OS_WIN)
   OutputDebugStringA(msg);
@@ -46,6 +44,8 @@ namespace disk_cache {
 
 #if ENABLE_TRACING
 
+static TraceBuffer* s_trace_buffer = NULL;
+
 bool InitTrace(void) {
   DCHECK(!s_trace_buffer);
   if (s_trace_buffer)
diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h
index 0525984..a9ba5c9 100644
--- a/webkit/tools/test_shell/test_webview_delegate.h
+++ b/webkit/tools/test_shell/test_webview_delegate.h
@@ -185,7 +185,7 @@ class TestWebViewDelegate : public base::RefCounted<TestWebViewDelegate>,
     WebNavigationType type,
     WindowOpenDisposition disposition,
     bool is_redirect);
-  void TestWebViewDelegate::SetCustomPolicyDelegate(bool isCustom);
+  void SetCustomPolicyDelegate(bool isCustom);
   virtual WebHistoryItem* GetHistoryEntryAtOffset(int offset);
   virtual void GoToEntryAtOffsetAsync(int offset);
   virtual int GetHistoryBackListCount();