Update from https://crrev.com/309415

cc/layers/ui_resource_layer_unittest.cc

 // Copyright 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 "cc/layers/ui_resource_layer.h"
 
 #include "cc/resources/prioritized_resource_manager.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/resources/resource_update_queue.h"
 #include "cc/resources/scoped_ui_resource.h"
@@ skipping 110 matching lines @@
   // ID is preserved even when you set ID first and attach it to the tree.
   layer_tree_host_->SetRootLayer(nullptr);
   scoped_ptr<ScopedUIResource> shared_resource = ScopedUIResource::Create(
       layer_tree_host_.get(), UIResourceBitmap(gfx::Size(5, 5), is_opaque));
   test_layer->SetUIResourceId(shared_resource->id());
   layer_tree_host_->SetRootLayer(test_layer);
   EXPECT_EQ(shared_resource->id(), test_layer->GetUIResourceId());
   EXPECT_TRUE(test_layer->DrawsContent());
 }
 
+TEST_F(UIResourceLayerTest, BitmapClearedOnSetUIResourceId) {
+  scoped_refptr<UIResourceLayer> test_layer = TestUIResourceLayer::Create();
+  ASSERT_TRUE(test_layer.get());
+  test_layer->SetBounds(gfx::Size(100, 100));
+
+  SkBitmap bitmap;
+  bitmap.allocN32Pixels(10, 10);
+  bitmap.setImmutable();
+  ASSERT_FALSE(bitmap.isNull());
+  ASSERT_TRUE(bitmap.pixelRef()->unique());
+
+  test_layer->SetBitmap(bitmap);
+  ASSERT_FALSE(bitmap.pixelRef()->unique());
+
+  test_layer->SetUIResourceId(0);
+  EXPECT_TRUE(bitmap.pixelRef()->unique());
+}
+
 }  // namespace
 }  // namespace cc