Revert "Update mojo sdk to rev 1dc8a9a5db73d3718d99917fadf31f5fb2ebad4f"

mandoline/ui/aura/surface_binding.cc

 // Copyright 2015 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 "mandoline/ui/aura/surface_binding.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
@@ skipping 196 matching lines @@
   mojo::URLRequestPtr request(mojo::URLRequest::New());
   request->url = mojo::String::From("mojo:surfaces_service");
   shell_->ConnectToApplication(request.Pass(),
                                GetProxy(&surfaces_service_provider),
                                nullptr);
   ConnectToService(surfaces_service_provider.get(), &surface_);
   surface_->GetIdNamespace(
       base::Bind(&SurfaceBinding::PerViewManagerState::SetIdNamespace,
                  base::Unretained(this)));
   // Block until we receive our id namespace.
-  surface_.WaitForIncomingResponse();
+  surface_.WaitForIncomingMethodCall();
   DCHECK_NE(0u, id_namespace_);
 
   mojo::ResourceReturnerPtr returner_ptr;
   returner_binding_.Bind(GetProxy(&returner_ptr));
   surface_->SetResourceReturner(returner_ptr.Pass());
 
   mojo::ServiceProviderPtr gpu_service_provider;
   // TODO(jamesr): Should be mojo:gpu_service
   mojo::URLRequestPtr request2(mojo::URLRequest::New());
   request2->url = mojo::String::From("mojo:view_manager");
@@ skipping 20 matching lines @@
 }
 
 SurfaceBinding::~SurfaceBinding() {
 }
 
 scoped_ptr<cc::OutputSurface> SurfaceBinding::CreateOutputSurface() {
   return state_->CreateOutputSurface(view_);
 }
 
 }  // namespace mandoline