Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(580)

Side by Side Diff: cc/layers/delegated_frame_resource_collection_unittest.cc

Issue 502203003: Remove implicit conversions from scoped_refptr to T* in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change to use .get() instead of rewriting local variable Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/bind.h" 5 #include "base/bind.h"
6 #include "base/run_loop.h" 6 #include "base/run_loop.h"
7 #include "base/synchronization/waitable_event.h" 7 #include "base/synchronization/waitable_event.h"
8 #include "base/threading/thread.h" 8 #include "base/threading/thread.h"
9 #include "cc/layers/delegated_frame_resource_collection.h" 9 #include "cc/layers/delegated_frame_resource_collection.h"
10 #include "cc/resources/returned_resource.h" 10 #include "cc/resources/returned_resource.h"
11 #include "cc/resources/transferable_resource.h" 11 #include "cc/resources/transferable_resource.h"
12 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
13 13
14 namespace cc { 14 namespace cc {
15 namespace { 15 namespace {
16 16
17 class DelegatedFrameResourceCollectionTest 17 class DelegatedFrameResourceCollectionTest
18 : public testing::Test, 18 : public testing::Test,
19 public DelegatedFrameResourceCollectionClient { 19 public DelegatedFrameResourceCollectionClient {
20 protected: 20 protected:
21 DelegatedFrameResourceCollectionTest() : resources_available_(false) {} 21 DelegatedFrameResourceCollectionTest() : resources_available_(false) {}
22 22
23 virtual void SetUp() OVERRIDE { CreateResourceCollection(); } 23 virtual void SetUp() OVERRIDE { CreateResourceCollection(); }
24 24
25 virtual void TearDown() OVERRIDE { DestroyResourceCollection(); } 25 virtual void TearDown() OVERRIDE { DestroyResourceCollection(); }
26 26
27 void CreateResourceCollection() { 27 void CreateResourceCollection() {
28 DCHECK(!resource_collection_); 28 DCHECK(!resource_collection_.get());
29 resource_collection_ = new DelegatedFrameResourceCollection; 29 resource_collection_ = new DelegatedFrameResourceCollection;
30 resource_collection_->SetClient(this); 30 resource_collection_->SetClient(this);
31 } 31 }
32 32
33 void DestroyResourceCollection() { 33 void DestroyResourceCollection() {
34 if (resource_collection_) { 34 if (resource_collection_.get()) {
35 resource_collection_->SetClient(NULL); 35 resource_collection_->SetClient(NULL);
36 resource_collection_ = NULL; 36 resource_collection_ = NULL;
37 } 37 }
38 } 38 }
39 39
40 TransferableResourceArray CreateResourceArray() { 40 TransferableResourceArray CreateResourceArray() {
41 TransferableResourceArray resources; 41 TransferableResourceArray resources;
42 TransferableResource resource; 42 TransferableResource resource;
43 resource.id = 444; 43 resource.id = 444;
44 resources.push_back(resource); 44 resources.push_back(resource);
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 base::Bind(&ReturnResourcesOnThread, 151 base::Bind(&ReturnResourcesOnThread,
152 return_callback, 152 return_callback,
153 returned_resources, 153 returned_resources,
154 null_event)); 154 null_event));
155 155
156 thread.Stop(); 156 thread.Stop();
157 } 157 }
158 158
159 } // namespace 159 } // namespace
160 } // namespace cc 160 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/delegated_frame_provider_unittest.cc ('k') | cc/layers/delegated_renderer_layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698