Revert 160631 - [cc] Store CCLayerImpls as scoped_ptrs

cc/CCHeadsUpDisplayLayerImpl.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 CCHeadsUpDisplayLayerImpl_h
 #define CCHeadsUpDisplayLayerImpl_h
 
 #include "base/memory/scoped_ptr.h"
 #include "CCFontAtlas.h"
 #include "CCLayerImpl.h"
 #include "CCScopedTexture.h"
 
 class SkCanvas;
 
 namespace cc {
 
 class CCDebugRectHistory;
 class CCFontAtlas;
 class CCFrameRateCounter;
 
 class CCHeadsUpDisplayLayerImpl : public CCLayerImpl {
 public:
-    static scoped_ptr<CCHeadsUpDisplayLayerImpl> create(int id)
+    static PassOwnPtr<CCHeadsUpDisplayLayerImpl> create(int id)
     {
-        return make_scoped_ptr(new CCHeadsUpDisplayLayerImpl(id));
+        return adoptPtr(new CCHeadsUpDisplayLayerImpl(id));
     }
     virtual ~CCHeadsUpDisplayLayerImpl();
 
     void setFontAtlas(scoped_ptr<CCFontAtlas>);
 
     virtual void willDraw(CCResourceProvider*) OVERRIDE;
     virtual void appendQuads(CCQuadSink&, CCAppendQuadsData&) OVERRIDE;
     void updateHudTexture(CCResourceProvider*);
     virtual void didDraw(CCResourceProvider*) OVERRIDE;
 
@@ skipping 12 matching lines @@
     void drawDebugRects(SkCanvas*, CCDebugRectHistory*);
 
     scoped_ptr<CCFontAtlas> m_fontAtlas;
     OwnPtr<CCScopedTexture> m_hudTexture;
     OwnPtr<SkCanvas> m_hudCanvas;
 };
 
 }  // namespace cc
 
 #endif // CCHeadsUpDisplayLayerImpl_h