Update view_manager and window_manager to make use of content handling.

mojo/examples/wm_flow/embedded/embedded.cc

Index: mojo/examples/wm_flow/embedded/embedded.cc
diff --git a/mojo/examples/wm_flow/embedded/embedded.cc b/mojo/examples/wm_flow/embedded/embedded.cc
index c1a9d0d539caaeb62a00be21f42a4c3d3930814e..0a0d86bafe0c2441e4e74fd611acae4f4ec898c7 100644
--- a/mojo/examples/wm_flow/embedded/embedded.cc
+++ b/mojo/examples/wm_flow/embedded/embedded.cc
@@ -40,17 +40,18 @@ class EmbeddeeImpl : public mojo::InterfaceImpl<Embeddee> {
 class WMFlowEmbedded : public mojo::ApplicationDelegate,
                        public mojo::ViewManagerDelegate {
  public:
-  WMFlowEmbedded()
-      : view_manager_client_factory_(this) {}
+  WMFlowEmbedded() {}
   virtual ~WMFlowEmbedded() {}
 
  private:
   // Overridden from Application:
   virtual void Initialize(mojo::ApplicationImpl* app) MOJO_OVERRIDE {
+    view_manager_client_factory_.reset(
+        new mojo::ViewManagerClientFactory(app->shell(), this));
   }
   virtual bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) MOJO_OVERRIDE {
-    connection->AddService(&view_manager_client_factory_);
+    connection->AddService(view_manager_client_factory_.get());
     return true;
   }
 
@@ -74,7 +75,7 @@ class WMFlowEmbedded : public mojo::ApplicationDelegate,
     printf("HelloWorld() ack'ed\n");
   }
 
-  mojo::ViewManagerClientFactory view_manager_client_factory_;
+  scoped_ptr<mojo::ViewManagerClientFactory> view_manager_client_factory_;
   EmbedderPtr embedder_;
   mojo::InterfaceFactoryImpl<EmbeddeeImpl> embeddee_factory_;