Get most of the View Manager client lib tests to pass again.

mojo/services/public/cpp/view_manager/lib/view_tree_node.cc

Index: mojo/services/public/cpp/view_manager/lib/view_tree_node.cc
diff --git a/mojo/services/public/cpp/view_manager/lib/view_tree_node.cc b/mojo/services/public/cpp/view_manager/lib/view_tree_node.cc
index 203d15ef6eed4996644b5c756a8dfa6c6e6389f3..9c46b2cd6377b59da64521079d940c7a2adc5965 100644
--- a/mojo/services/public/cpp/view_manager/lib/view_tree_node.cc
+++ b/mojo/services/public/cpp/view_manager/lib/view_tree_node.cc
@@ -45,19 +45,10 @@ void NotifyViewTreeChangeDown(
 void NotifyViewTreeChange(
     const ViewTreeNodeObserver::TreeChangeParams& params) {
   NotifyViewTreeChangeDown(params.target, params);
-  switch (params.phase) {
-  case ViewTreeNodeObserver::DISPOSITION_CHANGING:
-    if (params.old_parent)
-      NotifyViewTreeChangeUp(params.old_parent, params);
-    break;
-  case ViewTreeNodeObserver::DISPOSITION_CHANGED:
-    if (params.new_parent)
-      NotifyViewTreeChangeUp(params.new_parent, params);
-    break;
-  default:
-    NOTREACHED();
-    break;
-  }
+  if (params.old_parent)
+    NotifyViewTreeChangeUp(params.old_parent, params);
+  if (params.new_parent)
+    NotifyViewTreeChangeUp(params.new_parent, params);
 }
 
 class ScopedTreeNotifier {
@@ -321,7 +312,7 @@ void ViewTreeNode::LocalAddChild(ViewTreeNode* child) {
 
 void ViewTreeNode::LocalRemoveChild(ViewTreeNode* child) {
   DCHECK_EQ(this, child->parent());
-  ScopedTreeNotifier(child, this, NULL);
+  ScopedTreeNotifier notifier(child, this, NULL);
   RemoveChildImpl(child, &children_);
 }