New cache for the activity tracker.

base/debug/activity_tracker_unittest.cc

Index: base/debug/activity_tracker_unittest.cc
diff --git a/base/debug/activity_tracker_unittest.cc b/base/debug/activity_tracker_unittest.cc
index c36d8fac352cb169759d9a9e07db5c9648860010..a037d861ae78cbfeeda7405e666ed9ad677453d7 100644
--- a/base/debug/activity_tracker_unittest.cc
+++ b/base/debug/activity_tracker_unittest.cc
@@ -40,6 +40,34 @@ class TestActivityTracker : public ThreadActivityTracker {
 }  // namespace
 
 
+TEST(LockFreeSimpleFifo, PushPopTest) {
+  LockFreeSimpleFifo<int> fifo(10, -1);
+  ASSERT_EQ(0U, fifo.used());
+  ASSERT_EQ(10U, fifo.size());
+
+  fifo.push(1001);
+  EXPECT_EQ(1U, fifo.used());
+  EXPECT_EQ(10U, fifo.size());
+
+  fifo.push(2002);
+  EXPECT_EQ(2U, fifo.used());
+  EXPECT_EQ(10U, fifo.size());
+
+  int value = fifo.pop();
+  EXPECT_EQ(1001, value);
+  EXPECT_EQ(1U, fifo.used());
+  EXPECT_EQ(10U, fifo.size());
+
+  value = fifo.pop();
+  EXPECT_EQ(2002, value);
+  EXPECT_EQ(0U, fifo.used());
+  EXPECT_EQ(10U, fifo.size());
+
+  value = fifo.pop();
+  EXPECT_EQ(-1, value);
+}
+
+
 class ActivityTrackerTest : public testing::Test {
  public:
   const int kMemorySize = 1 << 10;  // 1MiB
@@ -72,8 +100,7 @@ class ActivityTrackerTest : public testing::Test {
     GlobalActivityTracker* global_tracker = GlobalActivityTracker::Get();
     if (!global_tracker)
       return 0;
-    return global_tracker->available_memories_count_.load(
-        std::memory_order_relaxed);
+    return global_tracker->available_memories_.used();
   }
 
   static void DoNothing() {}