Index: cc/trees/single_thread_proxy.cc |
diff --git a/cc/trees/single_thread_proxy.cc b/cc/trees/single_thread_proxy.cc |
index 97b06bc4894f892b1c2ba80b5aadf3500052d9c9..b3712b67734cd339b6a4dc4081377b07cc9f116c 100644 |
--- a/cc/trees/single_thread_proxy.cc |
+++ b/cc/trees/single_thread_proxy.cc |
@@ -26,8 +26,7 @@ scoped_ptr<Proxy> SingleThreadProxy::Create( |
LayerTreeHostSingleThreadClient* client, |
scoped_refptr<base::SingleThreadTaskRunner> main_task_runner) { |
return make_scoped_ptr( |
- new SingleThreadProxy(layer_tree_host, client, main_task_runner)) |
- .PassAs<Proxy>(); |
+ new SingleThreadProxy(layer_tree_host, client, main_task_runner)); |
} |
SingleThreadProxy::SingleThreadProxy( |
@@ -314,8 +313,8 @@ void SingleThreadProxy::Stop() { |
blocking_main_thread_task_runner()); |
layer_tree_host_->DeleteContentsTexturesOnImplThread( |
layer_tree_host_impl_->resource_provider()); |
- scheduler_on_impl_thread_.reset(); |
- layer_tree_host_impl_.reset(); |
+ scheduler_on_impl_thread_ = nullptr; |
+ layer_tree_host_impl_ = nullptr; |
} |
layer_tree_host_ = NULL; |
} |