Redo: Adding a mojo interface to the mojo spy

mojo/spy/spy.h

Index: mojo/spy/spy.h
diff --git a/mojo/spy/spy.h b/mojo/spy/spy.h
index c3673f453f4b0388198a4d2bf595d3cff0c9a402..020167fd07212d7ff6a9da9a35812e3c20802a73 100644
--- a/mojo/spy/spy.h
+++ b/mojo/spy/spy.h
@@ -6,15 +6,17 @@
 #define MOJO_SPY_SPY_H_
 
 #include <string>
+#include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 
 namespace base {
- class Thread;
+class Thread;
 }
 
 namespace mojo {
 
 class ServiceManager;
+class SpyServerImpl;
 
 // mojo::Spy is a troubleshooting and debugging aid. It helps tracking
 // the mojo system core activities like messages, service creation, etc.
@@ -31,8 +33,9 @@ class Spy {
   ~Spy();
 
  private:
-   // This thread runs the code that talks to the frontend.
-   scoped_ptr<base::Thread> control_thread_;
+  scoped_refptr<SpyServerImpl> spy_server_;
+  // This thread runs the code that talks to the frontend.
+  scoped_ptr<base::Thread> control_thread_;
 };
 
 }  // namespace mojo