8 files changed, 17 insertions, 19 deletions
diff --git a/components/exo/buffer.cc b/components/exo/buffer.cc
index de74136..86c04a2 100644
--- a/components/exo/buffer.cc
+++ b/components/exo/buffer.cc
@@ -453,9 +453,9 @@ gfx::Size Buffer::GetSize() const {
   return gpu_memory_buffer_->GetSize();
 }
 
-scoped_refptr<base::trace_event::TracedValue> Buffer::AsTracedValue() const {
-  scoped_refptr<base::trace_event::TracedValue> value =
-      new base::trace_event::TracedValue;
+scoped_ptr<base::trace_event::TracedValue> Buffer::AsTracedValue() const {
+  scoped_ptr<base::trace_event::TracedValue> value(
+      new base::trace_event::TracedValue());
   gfx::Size size = gpu_memory_buffer_->GetSize();
   value->SetInteger("width", size.width());
   value->SetInteger("height", size.height());
diff --git a/components/exo/buffer.h b/components/exo/buffer.h
index a98c4b31..84e744e 100644
--- a/components/exo/buffer.h
+++ b/components/exo/buffer.h
@@ -63,7 +63,7 @@ class Buffer : public base::SupportsWeakPtr<Buffer> {
   gfx::Size GetSize() const;
 
   // Returns a trace value representing the state of the buffer.
-  scoped_refptr<base::trace_event::TracedValue> AsTracedValue() const;
+  scoped_ptr<base::trace_event::TracedValue> AsTracedValue() const;
 
  private:
   class Texture;
diff --git a/components/exo/shell_surface.cc b/components/exo/shell_surface.cc
index 5e2e9eb..6ce2050 100644
--- a/components/exo/shell_surface.cc
+++ b/components/exo/shell_surface.cc
@@ -229,10 +229,9 @@ Surface* ShellSurface::GetMainSurface(const aura::Window* window) {
   return window->GetProperty(kMainSurfaceKey);
 }
 
-scoped_refptr<base::trace_event::TracedValue> ShellSurface::AsTracedValue()
-    const {
-  scoped_refptr<base::trace_event::TracedValue> value =
-      new base::trace_event::TracedValue;
+scoped_ptr<base::trace_event::TracedValue> ShellSurface::AsTracedValue() const {
+  scoped_ptr<base::trace_event::TracedValue> value(
+      new base::trace_event::TracedValue());
   value->SetString("title", base::UTF16ToUTF8(title_));
   value->SetString("application_id", application_id_);
   return value;
diff --git a/components/exo/shell_surface.h b/components/exo/shell_surface.h
index f1214d6..7f56d7d 100644
--- a/components/exo/shell_surface.h
+++ b/components/exo/shell_surface.h
@@ -99,7 +99,7 @@ class ShellSurface : public SurfaceDelegate,
   static Surface* GetMainSurface(const aura::Window* window);
 
   // Returns a trace value representing the state of the surface.
-  scoped_refptr<base::trace_event::TracedValue> AsTracedValue() const;
+  scoped_ptr<base::trace_event::TracedValue> AsTracedValue() const;
 
   // Overridden from SurfaceDelegate:
   void OnSurfaceCommit() override;
diff --git a/components/exo/sub_surface.cc b/components/exo/sub_surface.cc
index 6cdca07..2357a11 100644
--- a/components/exo/sub_surface.cc
+++ b/components/exo/sub_surface.cc
@@ -80,10 +80,9 @@ void SubSurface::SetCommitBehavior(bool synchronized) {
   is_synchronized_ = synchronized;
 }
 
-scoped_refptr<base::trace_event::TracedValue> SubSurface::AsTracedValue()
-    const {
-  scoped_refptr<base::trace_event::TracedValue> value =
-      new base::trace_event::TracedValue;
+scoped_ptr<base::trace_event::TracedValue> SubSurface::AsTracedValue() const {
+  scoped_ptr<base::trace_event::TracedValue> value(
+      new base::trace_event::TracedValue());
   value->SetBoolean("is_synchronized", is_synchronized_);
   return value;
 }
diff --git a/components/exo/sub_surface.h b/components/exo/sub_surface.h
index a2503a6..a42fcc4 100644
--- a/components/exo/sub_surface.h
+++ b/components/exo/sub_surface.h
@@ -6,7 +6,7 @@
 #define COMPONENTS_EXO_SUB_SURFACE_H_
 
 #include "base/macros.h"
-#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "components/exo/surface_delegate.h"
 #include "components/exo/surface_observer.h"
 #include "ui/gfx/geometry/point.h"
@@ -45,7 +45,7 @@ class SubSurface : public SurfaceDelegate, public SurfaceObserver {
   void SetCommitBehavior(bool synchronized);
 
   // Returns a trace value representing the state of the surface.
-  scoped_refptr<base::trace_event::TracedValue> AsTracedValue() const;
+  scoped_ptr<base::trace_event::TracedValue> AsTracedValue() const;
 
   // Overridden from SurfaceDelegate:
   void OnSurfaceCommit() override;
diff --git a/components/exo/surface.cc b/components/exo/surface.cc
index f5c3860..23a554a 100644
--- a/components/exo/surface.cc
+++ b/components/exo/surface.cc
@@ -443,9 +443,9 @@ bool Surface::HasSurfaceObserver(const SurfaceObserver* observer) const {
   return observers_.HasObserver(observer);
 }
 
-scoped_refptr<base::trace_event::TracedValue> Surface::AsTracedValue() const {
-  scoped_refptr<base::trace_event::TracedValue> value =
-      new base::trace_event::TracedValue;
+scoped_ptr<base::trace_event::TracedValue> Surface::AsTracedValue() const {
+  scoped_ptr<base::trace_event::TracedValue> value(
+      new base::trace_event::TracedValue());
   value->SetString("name", layer()->name());
   return value;
 }
diff --git a/components/exo/surface.h b/components/exo/surface.h
index ce6ba46..846d12b 100644
--- a/components/exo/surface.h
+++ b/components/exo/surface.h
@@ -123,7 +123,7 @@ class Surface : public aura::Window,
   bool HasSurfaceObserver(const SurfaceObserver* observer) const;
 
   // Returns a trace value representing the state of the surface.
-  scoped_refptr<base::trace_event::TracedValue> AsTracedValue() const;
+  scoped_ptr<base::trace_event::TracedValue> AsTracedValue() const;
 
   bool HasPendingDamageForTesting(const gfx::Rect& damage) const {
     return pending_damage_.contains(gfx::RectToSkIRect(damage));