Revert 269414 "Changes to deletion/ownership of nodes in the cli..."

trunk/src/mojo/services/public/cpp/view_manager/view_manager.h

Index: trunk/src/mojo/services/public/cpp/view_manager/view_manager.h
===================================================================
--- trunk/src/mojo/services/public/cpp/view_manager/view_manager.h	(revision 269420)
+++ trunk/src/mojo/services/public/cpp/view_manager/view_manager.h	(working copy)
@@ -5,8 +5,6 @@
 #ifndef MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_MANAGER_H_
 #define MOJO_SERVICES_PUBLIC_CPP_VIEW_MANAGER_VIEW_MANAGER_H_
 
-#include <map>
-
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "mojo/public/cpp/bindings/callback.h"
@@ -41,20 +39,15 @@
   // TODO(beng): this method could optionally not block if supplied a callback.
   void Init();
 
-  ViewTreeNode* tree() { return tree_; }
+  ViewTreeNode* tree() { return tree_.get(); }
 
-  ViewTreeNode* GetNodeById(TransportNodeId id);
-
  private:
   friend class ViewManagerPrivate;
-  typedef std::map<TransportNodeId, ViewTreeNode*> IdToNodeMap;
 
   Shell* shell_;
   scoped_ptr<ViewManagerSynchronizer> synchronizer_;
-  ViewTreeNode* tree_;
+  scoped_ptr<ViewTreeNode> tree_;
 
-  IdToNodeMap nodes_;
-
   DISALLOW_COPY_AND_ASSIGN(ViewManager);
 };