Remove redundant echo.mojom, verify non-nullables in echo_service.mojom

mojo/examples/dbus_echo/dbus_echo_service.cc

Index: mojo/examples/dbus_echo/dbus_echo_service.cc
diff --git a/mojo/services/dbus_echo/dbus_echo_service.cc b/mojo/examples/dbus_echo/dbus_echo_service.cc
similarity index 81%
rename from mojo/services/dbus_echo/dbus_echo_service.cc
rename to mojo/examples/dbus_echo/dbus_echo_service.cc
index ce79abdf127361f6a93f9e330d16f49eeeaecd30..c5e163e4eb222c207126414fd9b923afb3f07292 100644
--- a/mojo/services/dbus_echo/dbus_echo_service.cc
+++ b/mojo/examples/dbus_echo/dbus_echo_service.cc
@@ -13,17 +13,18 @@
 #include "mojo/embedder/channel_init.h"
 #include "mojo/embedder/embedder.h"
 #include "mojo/embedder/simple_platform_support.h"
+#include "mojo/examples/echo/echo_service.mojom.h"
 #include "mojo/public/cpp/environment/environment.h"
-#include "mojo/services/dbus_echo/echo.mojom.h"
 
 namespace {
-class EchoServiceImpl : public mojo::InterfaceImpl<mojo::EchoService> {
+class EchoServiceImpl
+    : public mojo::InterfaceImpl<mojo::examples::EchoService> {
  public:
   EchoServiceImpl() {}
   virtual ~EchoServiceImpl() {}
 
  protected:
-  virtual void Echo(
+  virtual void EchoString(
       const mojo::String& in_to_echo,
       const mojo::Callback<void(mojo::String)>& callback) OVERRIDE {
     DVLOG(1) << "Asked to echo " << in_to_echo;
@@ -41,10 +42,10 @@ int main(int argc, char** argv) {
   logging::LoggingSettings settings;
   settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
   logging::InitLogging(settings);
-  logging::SetLogItems(false,    // Process ID
-                       false,    // Thread ID
-                       false,    // Timestamp
-                       false);   // Tick count
+  logging::SetLogItems(false,   // Process ID
+                       false,   // Thread ID
+                       false,   // Timestamp
+                       false);  // Tick count
 
   mojo::embedder::Init(scoped_ptr<mojo::embedder::PlatformSupport>(
       new mojo::embedder::SimplePlatformSupport()));