Pull Sky debugger up to services/debugger.

services/debugger/debugger.cc

 // Copyright 2014 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.
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/debug/profiler.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/common/data_pipe_utils.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 "mojo/public/cpp/bindings/binding.h"
 #include "mojo/services/http_server/public/cpp/http_server_util.h"
 #include "mojo/services/http_server/public/interfaces/http_server.mojom.h"
 #include "mojo/services/http_server/public/interfaces/http_server_factory.mojom.h"
 #include "mojo/services/network/public/interfaces/net_address.mojom.h"
 #include "mojo/services/window_manager/public/interfaces/window_manager.mojom.h"
+#include "services/debugger/trace_collector.h"
 #include "services/tracing/tracing.mojom.h"
-#include "sky/tools/debugger/trace_collector.h"
 
-namespace sky {
+// Debugger is a Mojo application that exposes an http server and talks to other
+// mojo apps in response to url requests received by the server. Supported
+// actions include tracing and profiling, allowing to interactively inspect how
+// the shell is performing.
+
 namespace debugger {
 
-class SkyDebugger : public mojo::ApplicationDelegate,
+class Debugger : public mojo::ApplicationDelegate,
                     public http_server::HttpHandler {
  public:
-  SkyDebugger() : is_tracing_(false), app_(nullptr), handler_binding_(this) {}
-  ~SkyDebugger() override {}
+  Debugger() : is_tracing_(false), app_(nullptr), handler_binding_(this) {}
+  ~Debugger() override {}
 
  private:
   // mojo::ApplicationDelegate:
   void Initialize(mojo::ApplicationImpl* app) override {
     app_ = app;
     app->ConnectToService("mojo:window_manager", &window_manager_);
 
     // Format: --args-for="app_url command_port"
     if (app->args().size() < 2) {
       LOG(ERROR) << "--args-for required to specify command_port";
@@ skipping 107 matching lines @@
   }
 
   void StopTracing(const HandleRequestCallback& callback) {
     if (!is_tracing_) {
       Error(callback, "Not tracing yet. Use start_tracing to start.\n");
       return;
     }
 
     is_tracing_ = false;
     tracing_->StopAndFlush();
-    trace_collector_->GetTrace(base::Bind(&SkyDebugger::OnTraceAvailable,
+    trace_collector_->GetTrace(base::Bind(&Debugger::OnTraceAvailable,
                                           base::Unretained(this), callback));
   }
 
   void OnTraceAvailable(HandleRequestCallback callback, std::string trace) {
     trace_collector_.reset();
     Respond(callback, trace);
   }
 
   void StartProfiling(const HandleRequestCallback& callback) {
 #if !defined(NDEBUG) || !defined(ENABLE_PROFILING)
@@ skipping 20 matching lines @@
   mojo::WindowManagerPtr window_manager_;
   tracing::TraceCoordinatorPtr tracing_;
   std::string url_;
   uint32_t command_port_;
 
   http_server::HttpServerPtr http_server_;
   mojo::Binding<http_server::HttpHandler> handler_binding_;
 
   scoped_ptr<TraceCollector> trace_collector_;
 
-  DISALLOW_COPY_AND_ASSIGN(SkyDebugger);
+  DISALLOW_COPY_AND_ASSIGN(Debugger);
 };
 
 }  // namespace debugger
-}  // namespace sky
 
 MojoResult MojoMain(MojoHandle application_request) {
-  mojo::ApplicationRunnerChromium runner(new sky::debugger::SkyDebugger);
+  mojo::ApplicationRunnerChromium runner(new debugger::Debugger);
   runner.set_message_loop_type(base::MessageLoop::TYPE_IO);
   return runner.Run(application_request);
 }