Client side name cleanup

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

Index: mojo/services/public/cpp/view_manager/lib/view.cc
diff --git a/mojo/services/public/cpp/view_manager/lib/view.cc b/mojo/services/public/cpp/view_manager/lib/view.cc
index db5bbc082df239d6e8cfdf0a7c84c78c63a92d66..4bcedfce0808a25e082ad798037aa0f993c88066 100644
--- a/mojo/services/public/cpp/view_manager/lib/view.cc
+++ b/mojo/services/public/cpp/view_manager/lib/view.cc
@@ -4,10 +4,10 @@
 
 #include "mojo/services/public/cpp/view_manager/view.h"
 
-#include "mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.h"
+#include "mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h"
 #include "mojo/services/public/cpp/view_manager/lib/view_private.h"
+#include "mojo/services/public/cpp/view_manager/node.h"
 #include "mojo/services/public/cpp/view_manager/view_observer.h"
-#include "mojo/services/public/cpp/view_manager/view_tree_node.h"
 #include "ui/gfx/canvas.h"
 
 namespace mojo {
@@ -40,13 +40,13 @@ class ScopedDestructionNotifier {
 // static
 View* View::Create(ViewManager* manager) {
   View* view = new View(manager);
-  static_cast<ViewManagerSynchronizer*>(manager)->AddView(view);
+  static_cast<ViewManagerClientImpl*>(manager)->AddView(view);
   return view;
 }
 
 void View::Destroy() {
   if (manager_)
-    static_cast<ViewManagerSynchronizer*>(manager_)->DestroyView(id_);
+    static_cast<ViewManagerClientImpl*>(manager_)->DestroyView(id_);
   LocalDestroy();
 }
 
@@ -60,8 +60,8 @@ void View::RemoveObserver(ViewObserver* observer) {
 
 void View::SetContents(const SkBitmap& contents) {
   if (manager_) {
-    static_cast<ViewManagerSynchronizer*>(manager_)->SetViewContents(id_,
-                                                                     contents);
+    static_cast<ViewManagerClientImpl*>(manager_)->SetViewContents(id_,
+                                                                   contents);
   }
 }
 
@@ -72,7 +72,7 @@ void View::SetColor(SkColor color) {
 }
 
 View::View(ViewManager* manager)
-    : id_(static_cast<ViewManagerSynchronizer*>(manager)->CreateView()),
+    : id_(static_cast<ViewManagerClientImpl*>(manager)->CreateView()),
       node_(NULL),
       manager_(manager) {}
 
@@ -84,9 +84,9 @@ View::View()
 View::~View() {
   ScopedDestructionNotifier notifier(this);
   // TODO(beng): It'd be better to do this via a destruction observer in the
-  //             synchronizer.
+  //             ViewManagerClientImpl.
   if (manager_)
-    static_cast<ViewManagerSynchronizer*>(manager_)->RemoveView(id_);
+    static_cast<ViewManagerClientImpl*>(manager_)->RemoveView(id_);
 }
 
 void View::LocalDestroy() {