summaryrefslogtreecommitdiffstats
path: root/cc/layers/layer_unittest.cc
diff options
context:
space:
mode:
authordcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-12 16:23:58 +0000
committerdcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-12 16:23:58 +0000
commit547710bf35dba8f15ab269e2da2199e992708f03 (patch)
tree10c023f2d2d0684e572f51b25c05016b66f1a097 /cc/layers/layer_unittest.cc
parent85b863043edd48cbcb198675959d4c78da79592e (diff)
downloadchromium_src-547710bf35dba8f15ab269e2da2199e992708f03.zip
chromium_src-547710bf35dba8f15ab269e2da2199e992708f03.tar.gz
chromium_src-547710bf35dba8f15ab269e2da2199e992708f03.tar.bz2
Rewrite scoped_ptr<T>(NULL) to use the default ctor in cc/.
This is the result of running the rewrite_scoped_ptr_ctor_null tool across all files built on Linux in the cc/ directory. BUG=173286 Review URL: https://chromiumcodereview.appspot.com/16355009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205810 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layers/layer_unittest.cc')
-rw-r--r--cc/layers/layer_unittest.cc12
1 files changed, 5 insertions, 7 deletions
diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc
index 8eb5861..0a3f607 100644
--- a/cc/layers/layer_unittest.cc
+++ b/cc/layers/layer_unittest.cc
@@ -41,7 +41,7 @@ class MockLayerTreeHost : public LayerTreeHost {
public:
explicit MockLayerTreeHost(LayerTreeHostClient* client)
: LayerTreeHost(client, LayerTreeSettings()) {
- Initialize(scoped_ptr<Thread>(NULL));
+ Initialize(scoped_ptr<Thread>());
}
MOCK_METHOD0(SetNeedsCommit, void());
@@ -734,15 +734,13 @@ class LayerTreeHostFactory {
: client_(FakeLayerTreeHostClient::DIRECT_3D) {}
scoped_ptr<LayerTreeHost> Create() {
- return LayerTreeHost::Create(&client_,
- LayerTreeSettings(),
- scoped_ptr<Thread>(NULL)).Pass();
+ return LayerTreeHost::Create(
+ &client_, LayerTreeSettings(), scoped_ptr<Thread>()).Pass();
}
scoped_ptr<LayerTreeHost> Create(LayerTreeSettings settings) {
- return LayerTreeHost::Create(&client_,
- settings,
- scoped_ptr<Thread>(NULL)).Pass();
+ return LayerTreeHost::Create(&client_, settings, scoped_ptr<Thread>())
+ .Pass();
}
private: