Always use a SharedBitmapManager with the compositor.

Every time the compositor is created it should be given a SharedBitmapManager.

BUG=

Review URL: https://codereview.chromium.org/204713004

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

2 files changed, 9 insertions, 62 deletions

diff --git a/cc/output/overlay_unittest.cc b/cc/output/overlay_unittest.cc
index c8f069c..a1823c43 100644
--- a/cc/output/overlay_unittest.cc
+++ b/cc/output/overlay_unittest.cc
@@ -17,6 +17,7 @@
 #include "cc/test/fake_output_surface_client.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/test/test_context_provider.h"
+#include "cc/test/test_shared_bitmap_manager.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -209,8 +210,10 @@ TEST(OverlayTest, OverlaysProcessorHasStrategy) {
   output_surface.InitWithSingleOverlayValidator();
   EXPECT_TRUE(output_surface.overlay_candidate_validator() != NULL);
 
-  scoped_ptr<ResourceProvider> resource_provider(
-      ResourceProvider::Create(&output_surface, NULL, 0, false, 1));
+  scoped_ptr<SharedBitmapManager> shared_bitmap_manager(
+      new TestSharedBitmapManager());
+  scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
+      &output_surface, shared_bitmap_manager.get(), 0, false, 1));
 
   scoped_ptr<DefaultOverlayProcessor> overlay_processor(
       new DefaultOverlayProcessor(&output_surface, resource_provider.get()));
@@ -227,8 +230,9 @@ class SingleOverlayOnTopTest : public testing::Test {
     output_surface_->InitWithSingleOverlayValidator();
     EXPECT_TRUE(output_surface_->overlay_candidate_validator() != NULL);
 
-    resource_provider_ =
-        ResourceProvider::Create(output_surface_.get(), NULL, 0, false, 1);
+    shared_bitmap_manager_.reset(new TestSharedBitmapManager());
+    resource_provider_ = ResourceProvider::Create(
+        output_surface_.get(), shared_bitmap_manager_.get(), 0, false, 1);
 
     overlay_processor_.reset(new SingleOverlayProcessor(
         output_surface_.get(), resource_provider_.get()));
@@ -238,6 +242,7 @@ class SingleOverlayOnTopTest : public testing::Test {
   scoped_refptr<TestContextProvider> provider_;
   scoped_ptr<OverlayOutputSurface> output_surface_;
   FakeOutputSurfaceClient client_;
+  scoped_ptr<SharedBitmapManager> shared_bitmap_manager_;
   scoped_ptr<ResourceProvider> resource_provider_;
   scoped_ptr<SingleOverlayProcessor> overlay_processor_;
 };
diff --git a/cc/resources/resource_provider_unittest.cc b/cc/resources/resource_provider_unittest.cc
index 21feb89..537154a 100644
--- a/cc/resources/resource_provider_unittest.cc
+++ b/cc/resources/resource_provider_unittest.cc
@@ -1099,64 +1099,6 @@ TEST_P(ResourceProviderTest, TransferSoftwareResources) {
   EXPECT_FALSE(returned_to_child[3].lost);
 }
 
-TEST_P(ResourceProviderTest, TransferSoftwareToNonUber) {
-  // TODO(jbauman): Remove test when shared bitmap manager available
-  // everywhere.
-  if (GetParam() != ResourceProvider::Bitmap)
-    return;
-
-  scoped_ptr<FakeOutputSurface> parent_output_surface =
-      FakeOutputSurface::CreateSoftware(
-          make_scoped_ptr(new SoftwareOutputDevice));
-  FakeOutputSurfaceClient parent_output_surface_client;
-  CHECK(parent_output_surface->BindToClient(&parent_output_surface_client));
-
-  scoped_ptr<ResourceProvider> parent_resource_provider(
-      ResourceProvider::Create(parent_output_surface.get(),
-                               NULL,
-                               0,
-                               false,
-                               1));
-
-  gfx::Size size(1, 1);
-  ResourceFormat format = RGBA_8888;
-  size_t pixel_size = TextureSizeBytes(size, format);
-  ASSERT_EQ(4U, pixel_size);
-
-  ResourceProvider::ResourceId id1 = resource_provider_->CreateResource(
-      size, GL_CLAMP_TO_EDGE, ResourceProvider::TextureUsageAny, format);
-  uint8_t data1[4] = { 1, 2, 3, 4 };
-  gfx::Rect rect(size);
-  resource_provider_->SetPixels(id1, data1, rect, rect, gfx::Vector2d());
-
-  ReturnedResourceArray returned_to_child;
-  int child_id = parent_resource_provider->CreateChild(
-      GetReturnCallback(&returned_to_child));
-  {
-    ResourceProvider::ResourceIdArray resource_ids_to_transfer;
-    resource_ids_to_transfer.push_back(id1);
-    TransferableResourceArray list;
-    resource_provider_->PrepareSendToParent(resource_ids_to_transfer, &list);
-    ASSERT_EQ(1u, list.size());
-    EXPECT_TRUE(resource_provider_->InUseByConsumer(id1));
-    parent_resource_provider->ReceiveFromChild(child_id, list);
-  }
-
-  EXPECT_EQ(0u, parent_resource_provider->num_resources());
-  ASSERT_EQ(1u, returned_to_child.size());
-  EXPECT_EQ(returned_to_child[0].id, id1);
-  ResourceProvider::ResourceIdMap resource_map =
-      parent_resource_provider->GetChildToParentMap(child_id);
-  ResourceProvider::ResourceId mapped_id1 = resource_map[id1];
-  EXPECT_EQ(0u, mapped_id1);
-
-  parent_resource_provider->DestroyChild(child_id);
-  EXPECT_EQ(0u, parent_resource_provider->num_resources());
-
-  ASSERT_EQ(1u, returned_to_child.size());
-  EXPECT_FALSE(returned_to_child[0].lost);
-}
-
 TEST_P(ResourceProviderTest, TransferGLToSoftware) {
   if (GetParam() != ResourceProvider::Bitmap)
     return;