Fix StatsTable::RegisterThread so that it doesn't crash if shared memory...

base/stats_table_unittest.cc

 // Copyright (c) 2006-2008 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 "base/multiprocess_test.h"
 #include "base/platform_thread.h"
 #include "base/simple_thread.h"
 #include "base/shared_memory.h"
 #include "base/stats_table.h"
 #include "base/stats_counters.h"
@@ skipping 21 matching lines @@
 TEST_F(StatsTableTest, VerifySlots) {
   const std::string kTableName = "VerifySlotsStatTable";
   const int kMaxThreads = 1;
   const int kMaxCounter = 5;
   DeleteShmem(kTableName);
   StatsTable table(kTableName, kMaxThreads, kMaxCounter);
 
   // Register a single thread.
   std::string thread_name = "mainThread";
   int slot_id = table.RegisterThread(thread_name);
-  EXPECT_TRUE(slot_id);
+  EXPECT_NE(slot_id, 0);
 
   // Fill up the table with counters.
   std::string counter_base_name = "counter";
   for (int index=0; index < kMaxCounter; index++) {
     std::string counter_name = counter_base_name;
     StringAppendF(&counter_name, "counter.ctr%d", index);
     int counter_id = table.FindCounter(counter_name);
     EXPECT_GT(counter_id, 0);
   }
 
@@ skipping 201 matching lines @@
   const int kMaxThreads = 20;
   const int kMaxCounter = 5;
   DeleteShmem(kTableName);
   StatsTable table(kTableName, kMaxThreads, kMaxCounter);
   StatsTable::set_current(&table);
 
   MockStatsCounter foo("foo");
 
   // Test initial state.
   EXPECT_TRUE(foo.Enabled());
-  EXPECT_NE(foo.Pointer(), static_cast<int*>(0));
+  ASSERT_NE(foo.Pointer(), static_cast<int*>(0));
+  EXPECT_EQ(0, *(foo.Pointer()));
   EXPECT_EQ(0, table.GetCounterValue("c:foo"));
-  EXPECT_EQ(0, *(foo.Pointer()));
 
   // Test Increment.
   while(*(foo.Pointer()) < 123) foo.Increment();
   EXPECT_EQ(123, table.GetCounterValue("c:foo"));
   foo.Add(0);
   EXPECT_EQ(123, table.GetCounterValue("c:foo"));
   foo.Add(-1);
   EXPECT_EQ(122, table.GetCounterValue("c:foo"));
 
   // Test Set.
@@ skipping 121 matching lines @@
     PlatformThread::Sleep(500);
   }
   EXPECT_LE(1000, table.GetCounterValue("t:foo"));
   EXPECT_LE(1000, table.GetCounterValue("t:bar"));
   EXPECT_EQ(2, table.GetCounterValue("c:bar"));
 
   DeleteShmem(kTableName);
 }
 
 }  // namespace base