diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-14 17:41:05 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:37:36 +0000 |
| commit | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (patch) | |
| tree | 6b06b60ff365abef0e13b3503d593a0df48d20e8 /chromium/cc/layers/nine_patch_layer_unittest.cc | |
| parent | 7366110654eec46f21b6824f302356426f48cd74 (diff) | |
BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1
Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/cc/layers/nine_patch_layer_unittest.cc')
| -rw-r--r-- | chromium/cc/layers/nine_patch_layer_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/cc/layers/nine_patch_layer_unittest.cc b/chromium/cc/layers/nine_patch_layer_unittest.cc index 381c024bdbc..5cc14e2e76e 100644 --- a/chromium/cc/layers/nine_patch_layer_unittest.cc +++ b/chromium/cc/layers/nine_patch_layer_unittest.cc @@ -42,7 +42,7 @@ class NinePatchLayerTest : public testing::Test { FakeLayerTreeHostClient fake_client_; TestTaskGraphRunner task_graph_runner_; - scoped_ptr<FakeLayerTreeHost> layer_tree_host_; + std::unique_ptr<FakeLayerTreeHost> layer_tree_host_; }; TEST_F(NinePatchLayerTest, SetLayerProperties) { @@ -62,7 +62,7 @@ TEST_F(NinePatchLayerTest, SetLayerProperties) { EXPECT_FALSE(test_layer->DrawsContent()); bool is_opaque = false; - scoped_ptr<ScopedUIResource> resource = ScopedUIResource::Create( + std::unique_ptr<ScopedUIResource> resource = ScopedUIResource::Create( layer_tree_host_.get(), UIResourceBitmap(gfx::Size(10, 10), is_opaque)); gfx::Rect aperture(5, 5, 1, 1); bool fill_center = true; |