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

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/services/public/cpp/view_manager/view_tree_node.h"
 
 #include "mojo/services/public/cpp/view_manager/lib/view_manager_private.h"
 #include "mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.h"
 #include "mojo/services/public/cpp/view_manager/lib/view_private.h"
 #include "mojo/services/public/cpp/view_manager/lib/view_tree_node_private.h"
@@ skipping 27 matching lines @@
     const ViewTreeNodeObserver::TreeChangeParams& params) {
   NotifyViewTreeChangeAtReceiver(start_at, params);
   ViewTreeNode::Children::const_iterator it = start_at->children().begin();
   for (; it != start_at->children().end(); ++it)
     NotifyViewTreeChangeDown(*it, params);
 }
 
 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 {
  public:
   ScopedTreeNotifier(ViewTreeNode* target,
                      ViewTreeNode* old_parent,
                      ViewTreeNode* new_parent) {
     params_.target = target;
     params_.old_parent = old_parent;
     params_.new_parent = new_parent;
@@ skipping 243 matching lines @@
 void ViewTreeNode::LocalAddChild(ViewTreeNode* child) {
   ScopedTreeNotifier notifier(child, child->parent(), this);
   if (child->parent())
     RemoveChildImpl(child, &child->parent_->children_);
   children_.push_back(child);
   child->parent_ = this;
 }
 
 void ViewTreeNode::LocalRemoveChild(ViewTreeNode* child) {
   DCHECK_EQ(this, child->parent());
-  ScopedTreeNotifier(child, this, NULL);
+  ScopedTreeNotifier notifier(child, this, NULL);
   RemoveChildImpl(child, &children_);
 }
 
 void ViewTreeNode::LocalSetActiveView(View* view) {
   ScopedSetActiveViewNotifier notifier(this, active_view_, view);
   if (active_view_)
     ViewPrivate(active_view_).set_node(NULL);
   active_view_ = view;
   if (active_view_)
     ViewPrivate(active_view_).set_node(this);
 }
 
 void ViewTreeNode::LocalSetBounds(const gfx::Rect& old_bounds,
                                   const gfx::Rect& new_bounds) {
   DCHECK(old_bounds == bounds_);
   ScopedSetBoundsNotifier notifier(this, old_bounds, new_bounds);
   bounds_ = new_bounds;
 }
 
 }  // namespace view_manager
 }  // namespace mojo