Revert "Update mojo sdk to rev 1dc8a9a5db73d3718d99917fadf31f5fb2ebad4f"

components/html_viewer/web_cookie_jar_impl.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 "components/html_viewer/web_cookie_jar_impl.h"
 
 #include "base/bind.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 
 using mojo::String;
@@ skipping 25 matching lines @@
   store_->Set(url.string().utf8(), cookie.utf8(),
               base::Bind(&CopyBool, &success));
 
   // Wait to ensure the cookie was set before advancing. That way any
   // subsequent URL request will see the changes to the cookie store.
   //
   // TODO(darin): Consider using associated message pipes for the CookieStore
   // and URLLoader, so that we could let this method call run asynchronously
   // without suffering an ordering problem. See crbug/386825.
   //
-  store_.WaitForIncomingResponse();
+  store_.WaitForIncomingMethodCall();
 }
 
 blink::WebString WebCookieJarImpl::cookies(
     const blink::WebURL& url,
     const blink::WebURL& first_party_for_cookies) {
   String result;
   store_->Get(url.string().utf8(), base::Bind(&CopyString, &result));
 
   // Wait for the result. Since every outbound request we make to the cookie
-  // store is followed up with WaitForIncomingResponse, we can be sure that
+  // store is followed up with WaitForIncomingMethodCall, we can be sure that
   // the next incoming method call will be the response to our request.
-  store_.WaitForIncomingResponse();
+  store_.WaitForIncomingMethodCall();
   if (!result)
     return blink::WebString();
 
   return blink::WebString::fromUTF8(result);
 }
 
 blink::WebString WebCookieJarImpl::cookieRequestHeaderFieldValue(
     const blink::WebURL& url,
     const blink::WebURL& first_party_for_cookies) {
   return cookies(url, first_party_for_cookies);
 }
 
 }  // namespace html_viewer