Add HostSharedBitmapManagerClient to organize bitmaps coming from renderers.

content/common/host_shared_bitmap_manager_unittest.cc

 // Copyright (c) 2013 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 "content/common/host_shared_bitmap_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 namespace {
 
 class HostSharedBitmapManagerTest : public testing::Test {
  protected:
   void SetUp() override { manager_.reset(new HostSharedBitmapManager()); }
   scoped_ptr<HostSharedBitmapManager> manager_;
 };
 
 TEST_F(HostSharedBitmapManagerTest, TestCreate) {
   gfx::Size bitmap_size(1, 1);
   size_t size_in_bytes;
   EXPECT_TRUE(cc::SharedBitmap::SizeInBytes(bitmap_size, &size_in_bytes));
   scoped_ptr<base::SharedMemory> bitmap(new base::SharedMemory());
   bitmap->CreateAndMapAnonymous(size_in_bytes);
   memset(bitmap->memory(), 0xff, size_in_bytes);
   cc::SharedBitmapId id = cc::SharedBitmap::GenerateId();
 
+  HostSharedBitmapManagerClient client(manager_.get());
   base::SharedMemoryHandle handle;
   bitmap->ShareToProcess(base::GetCurrentProcessHandle(), &handle);
-  manager_->ChildAllocatedSharedBitmap(
-      size_in_bytes, handle, base::GetCurrentProcessHandle(), id);
+  client.ChildAllocatedSharedBitmap(size_in_bytes, handle,
+                                    base::GetCurrentProcessHandle(), id);
 
   scoped_ptr<cc::SharedBitmap> large_bitmap;
   large_bitmap = manager_->GetSharedBitmapFromId(gfx::Size(1024, 1024), id);
   EXPECT_TRUE(large_bitmap.get() == NULL);
 
   scoped_ptr<cc::SharedBitmap> very_large_bitmap;
   very_large_bitmap =
       manager_->GetSharedBitmapFromId(gfx::Size(1, (1 << 30) | 1), id);
   EXPECT_TRUE(very_large_bitmap.get() == NULL);
 
@@ skipping 16 matching lines @@
   large_bitmap2 = manager_->GetSharedBitmapFromId(gfx::Size(1024, 1024), id);
   EXPECT_TRUE(large_bitmap2.get() == NULL);
 
   scoped_ptr<cc::SharedBitmap> shared_bitmap2;
   shared_bitmap2 = manager_->GetSharedBitmapFromId(bitmap_size, id);
   EXPECT_TRUE(shared_bitmap2->pixels() == shared_bitmap->pixels());
   shared_bitmap2.reset();
   EXPECT_EQ(memcmp(shared_bitmap->pixels(), bitmap->memory(), size_in_bytes),
             0);
 
-  manager_->ChildDeletedSharedBitmap(id);
+  client.ChildDeletedSharedBitmap(id);
 
   memset(bitmap->memory(), 0, size_in_bytes);
 
   EXPECT_EQ(memcmp(shared_bitmap->pixels(), bitmap->memory(), size_in_bytes),
             0);
   bitmap.reset();
   shared_bitmap.reset();
 }
 
 TEST_F(HostSharedBitmapManagerTest, TestCreateForChild) {
   gfx::Size bitmap_size(1, 1);
   size_t size_in_bytes;
   EXPECT_TRUE(cc::SharedBitmap::SizeInBytes(bitmap_size, &size_in_bytes));
   cc::SharedBitmapId id = cc::SharedBitmap::GenerateId();
+  HostSharedBitmapManagerClient client(manager_.get());
   base::SharedMemoryHandle handle;
-  manager_->AllocateSharedBitmapForChild(
-      base::GetCurrentProcessHandle(), size_in_bytes, id, &handle);
+  client.AllocateSharedBitmapForChild(base::GetCurrentProcessHandle(),
+                                      size_in_bytes, id, &handle);
 
   EXPECT_TRUE(base::SharedMemory::IsHandleValid(handle));
   scoped_ptr<base::SharedMemory> bitmap(new base::SharedMemory(handle, false));
   EXPECT_TRUE(bitmap->Map(size_in_bytes));
   memset(bitmap->memory(), 0xff, size_in_bytes);
 
   scoped_ptr<cc::SharedBitmap> shared_bitmap;
   shared_bitmap = manager_->GetSharedBitmapFromId(bitmap_size, id);
   EXPECT_TRUE(shared_bitmap);
   EXPECT_TRUE(
       memcmp(bitmap->memory(), shared_bitmap->pixels(), size_in_bytes) == 0);
 
-  manager_->ChildDeletedSharedBitmap(id);
+  client.ChildDeletedSharedBitmap(id);
 }
 
 TEST_F(HostSharedBitmapManagerTest, RemoveProcess) {
   gfx::Size bitmap_size(1, 1);
   size_t size_in_bytes;
   EXPECT_TRUE(cc::SharedBitmap::SizeInBytes(bitmap_size, &size_in_bytes));
   scoped_ptr<base::SharedMemory> bitmap(new base::SharedMemory());
   bitmap->CreateAndMapAnonymous(size_in_bytes);
   memset(bitmap->memory(), 0xff, size_in_bytes);
   cc::SharedBitmapId id = cc::SharedBitmap::GenerateId();
 
   base::SharedMemoryHandle handle;
+  scoped_ptr<HostSharedBitmapManagerClient> client(
+      new HostSharedBitmapManagerClient(manager_.get()));
   bitmap->ShareToProcess(base::GetCurrentProcessHandle(), &handle);
-  manager_->ChildAllocatedSharedBitmap(
-      size_in_bytes, handle, base::GetCurrentProcessHandle(), id);
-
-  manager_->ProcessRemoved(base::kNullProcessHandle);
+  client->ChildAllocatedSharedBitmap(size_in_bytes, handle,
+                                     base::GetCurrentProcessHandle(), id);
 
   scoped_ptr<cc::SharedBitmap> shared_bitmap;
   shared_bitmap = manager_->GetSharedBitmapFromId(bitmap_size, id);
   ASSERT_TRUE(shared_bitmap.get() != NULL);
 
-  manager_->ProcessRemoved(base::GetCurrentProcessHandle());
+  EXPECT_EQ(1u, manager_->AllocatedBitmapCount());
+  client.reset();
+  EXPECT_EQ(0u, manager_->AllocatedBitmapCount());
 
   scoped_ptr<cc::SharedBitmap> shared_bitmap2;
   shared_bitmap2 = manager_->GetSharedBitmapFromId(bitmap_size, id);
   EXPECT_TRUE(shared_bitmap2.get() == NULL);
   EXPECT_EQ(memcmp(shared_bitmap->pixels(), bitmap->memory(), size_in_bytes),
             0);
 
   shared_bitmap.reset();
-
-  // Should no-op.
-  manager_->ChildDeletedSharedBitmap(id);
 }
 
 TEST_F(HostSharedBitmapManagerTest, AddDuplicate) {
   gfx::Size bitmap_size(1, 1);
   size_t size_in_bytes;
   EXPECT_TRUE(cc::SharedBitmap::SizeInBytes(bitmap_size, &size_in_bytes));
   scoped_ptr<base::SharedMemory> bitmap(new base::SharedMemory());
   bitmap->CreateAndMapAnonymous(size_in_bytes);
   memset(bitmap->memory(), 0xff, size_in_bytes);
   cc::SharedBitmapId id = cc::SharedBitmap::GenerateId();
+  HostSharedBitmapManagerClient client(manager_.get());
 
   base::SharedMemoryHandle handle;
   bitmap->ShareToProcess(base::GetCurrentProcessHandle(), &handle);
-  manager_->ChildAllocatedSharedBitmap(
-      size_in_bytes, handle, base::GetCurrentProcessHandle(), id);
+  client.ChildAllocatedSharedBitmap(size_in_bytes, handle,
+                                    base::GetCurrentProcessHandle(), id);
 
   scoped_ptr<base::SharedMemory> bitmap2(new base::SharedMemory());
   bitmap2->CreateAndMapAnonymous(size_in_bytes);
   memset(bitmap2->memory(), 0x00, size_in_bytes);
 
-  manager_->ChildAllocatedSharedBitmap(
-      size_in_bytes, bitmap2->handle(), base::GetCurrentProcessHandle(), id);
+  client.ChildAllocatedSharedBitmap(size_in_bytes, bitmap2->handle(),
+                                    base::GetCurrentProcessHandle(), id);
 
   scoped_ptr<cc::SharedBitmap> shared_bitmap;
   shared_bitmap = manager_->GetSharedBitmapFromId(bitmap_size, id);
   ASSERT_TRUE(shared_bitmap.get() != NULL);
   EXPECT_EQ(memcmp(shared_bitmap->pixels(), bitmap->memory(), size_in_bytes),
             0);
-  manager_->ChildDeletedSharedBitmap(id);
+  client.ChildDeletedSharedBitmap(id);
 }
 
 }  // namespace
 }  // namespace content