Revert "Update mojo sdk to rev 1dc8a9a5db73d3718d99917fadf31f5fb2ebad4f"

components/resource_provider/public/cpp/resource_loader.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 "components/resource_provider/public/cpp/resource_loader.h"
 
 #include "base/bind.h"
 #include "base/files/file.h"
 #include "mojo/application/public/cpp/connect.h"
 #include "mojo/application/public/interfaces/shell.mojom.h"
@@ skipping 20 matching lines @@
 }
 
 ResourceLoader::~ResourceLoader() {
 }
 
 bool ResourceLoader::BlockUntilLoaded() {
   if (did_block_ || loaded_)
     return loaded_;
 
   did_block_ = true;
-  resource_provider_.WaitForIncomingResponse();
+  resource_provider_.WaitForIncomingMethodCall();
   return loaded_;
 }
 
 base::File ResourceLoader::ReleaseFile(const std::string& path) {
   CHECK(resource_map_.count(path));
   scoped_ptr<base::File> file_wrapper(resource_map_[path].Pass());
   resource_map_.erase(path);
   return file_wrapper->Pass();
 }
 
 void ResourceLoader::OnGotResources(const std::vector<std::string>& paths,
                                     mojo::Array<mojo::ScopedHandle> resources) {
   // We no longer need the connection to ResourceProvider.
   resource_provider_.reset();
   resource_provider_service_provider_.reset();
 
   CHECK(!resources.is_null());
   CHECK_EQ(resources.size(), paths.size());
   for (size_t i = 0; i < resources.size(); ++i) {
     CHECK(resources[i].is_valid());
     MojoPlatformHandle platform_handle;
     CHECK(MojoExtractPlatformHandle(resources[i].release().value(),
                                     &platform_handle) == MOJO_RESULT_OK);
     resource_map_[paths[i]].reset(new base::File(platform_handle));
   }
   loaded_ = true;
 }
 
 }  // namespace resource_provider