cc: Remove use of PassAs() and constructor-casting with scoped_ptr.

cc/test/layer_test_common.h

 // Copyright 2012 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.
 
 #ifndef CC_TEST_LAYER_TEST_COMMON_H_
 #define CC_TEST_LAYER_TEST_COMMON_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/quads/render_pass.h"
@@ skipping 37 matching lines @@
 
   class LayerImplTest {
    public:
     LayerImplTest();
     ~LayerImplTest();
 
     template <typename T>
     T* AddChildToRoot() {
       scoped_ptr<T> layer = T::Create(host_->host_impl()->active_tree(), 2);
       T* ptr = layer.get();
-      root_layer_impl_->AddChild(layer.template PassAs<LayerImpl>());
+      root_layer_impl_->AddChild(layer.Pass());
       return ptr;
     }
 
     template <typename T, typename A>
     T* AddChildToRoot(const A& a) {
       scoped_ptr<T> layer = T::Create(host_->host_impl()->active_tree(), 2, a);
       T* ptr = layer.get();
-      root_layer_impl_->AddChild(layer.template PassAs<LayerImpl>());
+      root_layer_impl_->AddChild(layer.Pass());
       return ptr;
     }
 
     template <typename T, typename A, typename B>
     T* AddChildToRoot(const A& a, const B& b) {
       scoped_ptr<T> layer =
           T::Create(host_->host_impl()->active_tree(), 2, a, b);
       T* ptr = layer.get();
-      root_layer_impl_->AddChild(layer.template PassAs<LayerImpl>());
+      root_layer_impl_->AddChild(layer.Pass());
       return ptr;
     }
 
     template <typename T, typename A, typename B, typename C, typename D>
     T* AddChildToRoot(const A& a, const B& b, const C& c, const D& d) {
       scoped_ptr<T> layer =
           T::Create(host_->host_impl()->active_tree(), 2, a, b, c, d);
       T* ptr = layer.get();
-      root_layer_impl_->AddChild(layer.template PassAs<LayerImpl>());
+      root_layer_impl_->AddChild(layer.Pass());
       return ptr;
     }
 
     template <typename T,
               typename A,
               typename B,
               typename C,
               typename D,
               typename E>
     T* AddChildToRoot(const A& a,
                       const B& b,
                       const C& c,
                       const D& d,
                       const E& e) {
       scoped_ptr<T> layer =
           T::Create(host_->host_impl()->active_tree(), 2, a, b, c, d, e);
       T* ptr = layer.get();
-      root_layer_impl_->AddChild(layer.template PassAs<LayerImpl>());
+      root_layer_impl_->AddChild(layer.Pass());
       return ptr;
     }
 
     void CalcDrawProps(const gfx::Size& viewport_size);
     void AppendQuadsWithOcclusion(LayerImpl* layer_impl,
                                   const gfx::Rect& occluded);
     void AppendQuadsForPassWithOcclusion(LayerImpl* layer_impl,
                                          const RenderPassId& id,
                                          const gfx::Rect& occluded);
     void AppendSurfaceQuadsWithOcclusion(RenderSurfaceImpl* surface_impl,
@@ skipping 15 matching lines @@
     scoped_ptr<FakeLayerTreeHost> host_;
     scoped_ptr<LayerImpl> root_layer_impl_;
     scoped_ptr<RenderPass> render_pass_;
     MockOcclusionTracker<LayerImpl> occlusion_tracker_;
   };
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_LAYER_TEST_COMMON_H_