Revert of Update mojo sdk to rev 8af2ccff2eee4bfca1043015abee30482a030b30

third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_impl.cc

Index: third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_impl.cc
diff --git a/third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_impl.cc b/third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_impl.cc
index 3fffac256b2aedc56440dff1a2dd833fbbc7ee33..eea760bbabb18df62f3a9ee47a9bb9fb3e10a631 100644
--- a/third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_impl.cc
+++ b/third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_impl.cc
@@ -93,12 +93,12 @@
   DISALLOW_COPY_AND_ASSIGN(RootObserver);
 };
 
-ViewManagerClientImpl::ViewManagerClientImpl(
-    ViewManagerDelegate* delegate,
-    Shell* shell,
-    InterfaceRequest<ViewManagerClient> request,
-    bool delete_on_error)
-    : connection_id_(0),
+ViewManagerClientImpl::ViewManagerClientImpl(ViewManagerDelegate* delegate,
+                                             Shell* shell,
+                                             ScopedMessagePipeHandle handle,
+                                             bool delete_on_error)
+    : connected_(false),
+      connection_id_(0),
       next_id_(1),
       delegate_(delegate),
       root_(nullptr),
@@ -106,7 +106,8 @@
       focused_view_(nullptr),
       activated_view_(nullptr),
       wm_observer_binding_(this),
-      binding_(this, request.Pass()),
+      binding_(this, handle.Pass()),
+      service_(binding_.client()),
       delete_on_error_(delete_on_error) {
 }
 
@@ -132,17 +133,17 @@
 }
 
 void ViewManagerClientImpl::DestroyView(Id view_id) {
-  DCHECK(service_);
+  DCHECK(connected_);
   service_->DeleteView(view_id, ActionCompletedCallback());
 }
 
 void ViewManagerClientImpl::AddChild(Id child_id, Id parent_id) {
-  DCHECK(service_);
+  DCHECK(connected_);
   service_->AddView(parent_id, child_id, ActionCompletedCallback());
 }
 
 void ViewManagerClientImpl::RemoveChild(Id child_id, Id parent_id) {
-  DCHECK(service_);
+  DCHECK(connected_);
   service_->RemoveViewFromParent(child_id, ActionCompletedCallback());
 }
 
@@ -150,7 +151,7 @@
     Id view_id,
     Id relative_view_id,
     OrderDirection direction) {
-  DCHECK(service_);
+  DCHECK(connected_);
   service_->ReorderView(view_id, relative_view_id, direction,
                         ActionCompletedCallback());
 }
@@ -160,12 +161,12 @@
 }
 
 void ViewManagerClientImpl::SetBounds(Id view_id, const Rect& bounds) {
-  DCHECK(service_);
+  DCHECK(connected_);
   service_->SetViewBounds(view_id, bounds.Clone(), ActionCompletedCallback());
 }
 
 void ViewManagerClientImpl::SetSurfaceId(Id view_id, SurfaceIdPtr surface_id) {
-  DCHECK(service_);
+  DCHECK(connected_);
   if (surface_id.is_null())
     return;
   service_->SetViewSurfaceId(
@@ -180,7 +181,7 @@
 }
 
 void ViewManagerClientImpl::SetVisible(Id view_id, bool visible) {
-  DCHECK(service_);
+  DCHECK(connected_);
   service_->SetViewVisibility(view_id, visible, ActionCompletedCallback());
 }
 
@@ -188,7 +189,7 @@
     Id view_id,
     const std::string& name,
     const std::vector<uint8_t>& data) {
-  DCHECK(service_);
+  DCHECK(connected_);
   service_->SetViewProperty(view_id,
                             String(name),
                             Array<uint8_t>::From(data),
@@ -203,7 +204,7 @@
                                   Id view_id,
                                   InterfaceRequest<ServiceProvider> services,
                                   ServiceProviderPtr exposed_services) {
-  DCHECK(service_);
+  DCHECK(connected_);
   service_->Embed(url, view_id, services.Pass(), exposed_services.Pass(),
                   ActionCompletedCallback());
 }
@@ -219,17 +220,11 @@
     views_.erase(it);
 }
 
-void ViewManagerClientImpl::SetViewManagerService(
-    ViewManagerServicePtr service) {
-  DCHECK(!service_);
-  DCHECK(service);
-  service_ = service.Pass();
-}
 ////////////////////////////////////////////////////////////////////////////////
 // ViewManagerClientImpl, ViewManager implementation:
 
 Id ViewManagerClientImpl::CreateViewOnServer() {
-  DCHECK(service_);
+  DCHECK(connected_);
   const Id view_id = MakeTransportId(connection_id_, ++next_id_);
   service_->CreateView(view_id, ActionCompletedCallbackWithErrorCode());
   return view_id;
@@ -265,14 +260,11 @@
     ConnectionSpecificId connection_id,
     const String& creator_url,
     ViewDataPtr root_data,
-    ViewManagerServicePtr view_manager_service,
     InterfaceRequest<ServiceProvider> services,
     ServiceProviderPtr exposed_services,
     ScopedMessagePipeHandle window_manager_pipe) {
-  if (view_manager_service) {
-    DCHECK(!service_);
-    service_ = view_manager_service.Pass();
-  }
+  DCHECK(!connected_);
+  connected_ = true;
   connection_id_ = connection_id;
   creator_url_ = String::From(creator_url);