diff --git a/tools/debugger/prompt/BUILD.gn b/tools/debugger/prompt/BUILD.gn
index c6fbccfafaa..8429d6c72ff 100644
--- a/tools/debugger/prompt/BUILD.gn
+++ b/tools/debugger/prompt/BUILD.gn
@@ -14,10 +14,10 @@ mojo_native_application("prompt") {
   deps = [
     "//base",
     "//mojo/application",
-    "//mojo/common:tracing_bindings",
     "//mojo/public/c/system:for_shared_library",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/utility",
+    "//services/tracing:bindings",
     "//sky/tools/debugger:bindings",
     "//sky/viewer:bindings",
   ]
diff --git a/tools/debugger/prompt/prompt.cc b/tools/debugger/prompt/prompt.cc
index f400055ac22..6ef357d1d22 100644
--- a/tools/debugger/prompt/prompt.cc
+++ b/tools/debugger/prompt/prompt.cc
@@ -5,10 +5,10 @@
 #include "base/bind.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/application/application_runner_chromium.h"
-#include "mojo/common/tracing.mojom.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
+#include "services/tracing/tracing.mojom.h"
 #include "sky/tools/debugger/debugger.mojom.h"
 #include <iostream>
 
@@ -42,7 +42,7 @@ class Prompt : public mojo::ApplicationDelegate {
  private:
   // Overridden from mojo::ApplicationDelegate:
   virtual void Initialize(mojo::ApplicationImpl* app) override {
-    app->ConnectToService("mojo:sky_viewer", &tracing_);
+    app->ConnectToService("mojo:tracing", &tracing_);
     if (app->args().size() > 1)
       url_ = app->args()[1];
     else {
@@ -138,17 +138,17 @@ class Prompt : public mojo::ApplicationDelegate {
   void ToggleTracing() {
     if (is_tracing_) {
       std::cout << "Stopping trace (writing to sky_viewer.trace)" << std::endl;
-      tracing_->Stop();
+      tracing_->StopAndFlush();
     } else {
       std::cout << "Starting trace (type 'trace' to stop tracing)" << std::endl;
-      tracing_->Start();
+      tracing_->Start(mojo::String("sky_viewer"), mojo::String("*"));
     }
     is_tracing_ = !is_tracing_;
   }
 
   bool is_tracing_;
   DebuggerPtr debugger_;
-  mojo::TracingPtr tracing_;
+  tracing::TraceCoordinatorPtr tracing_;
   std::string url_;
   base::WeakPtrFactory<Prompt> weak_ptr_factory_;
 
diff --git a/viewer/viewer.cc b/viewer/viewer.cc
index 9a325151b32..9db52a1e53e 100644
--- a/viewer/viewer.cc
+++ b/viewer/viewer.cc
@@ -25,8 +25,7 @@
 namespace sky {
 
 class Viewer : public mojo::ApplicationDelegate,
-               public mojo::InterfaceFactory<mojo::ContentHandler>,
-               public mojo::InterfaceFactory<mojo::Tracing> {
+               public mojo::InterfaceFactory<mojo::ContentHandler> {
  public:
   Viewer() {}
 
@@ -38,12 +37,13 @@ class Viewer : public mojo::ApplicationDelegate,
     platform_impl_.reset(new PlatformImpl(app));
     blink::initialize(platform_impl_.get());
     base::i18n::InitializeICU();
+
+    mojo::TracingImpl::Create(app);
   }
 
   virtual bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) override {
     connection->AddService<mojo::ContentHandler>(this);
-    connection->AddService<mojo::Tracing>(this);
     return true;
   }
 
@@ -53,12 +53,6 @@ class Viewer : public mojo::ApplicationDelegate,
     mojo::BindToRequest(new ContentHandlerImpl(), &request);
   }
 
-  // Overridden from InterfaceFactory<Tracing>
-  virtual void Create(mojo::ApplicationConnection* connection,
-                      mojo::InterfaceRequest<mojo::Tracing> request) override {
-    new mojo::TracingImpl(request.Pass(), FILE_PATH_LITERAL("sky_viewer"));
-  }
-
   scoped_ptr<PlatformImpl> platform_impl_;
 
   DISALLOW_COPY_AND_ASSIGN(Viewer);