Update mojo sdk to rev 1dc8a9a5db73d3718d99917fadf31f5fb2ebad4f

components/html_viewer/web_clipboard_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_clipboard_impl.h"
 
 #include "base/bind.h"
 #include "components/html_viewer/blink_basic_type_converters.h"
 
 using mojo::Array;
@@ skipping 51 matching lines @@
 }
 
 uint64_t WebClipboardImpl::sequenceNumber(Buffer buffer) {
   mojo::Clipboard::Type clipboard_type = ConvertBufferType(buffer);
 
   uint64_t number = 0;
   clipboard_->GetSequenceNumber(clipboard_type,
                                 base::Bind(&CopyUint64, &number));
 
   // Force this to be synchronous.
-  clipboard_.WaitForIncomingMethodCall();
+  clipboard_.WaitForIncomingResponse();
   return number;
 }
 
 bool WebClipboardImpl::isFormatAvailable(Format format, Buffer buffer) {
   Clipboard::Type clipboard_type = ConvertBufferType(buffer);
 
   std::vector<std::string> types;
   clipboard_->GetAvailableMimeTypes(
       clipboard_type, base::Bind(&CopyVectorString, &types));
 
   // Force this to be synchronous.
-  clipboard_.WaitForIncomingMethodCall();
+  clipboard_.WaitForIncomingResponse();
 
   switch (format) {
     case FormatPlainText:
       return Contains(types, Clipboard::MIME_TYPE_TEXT);
     case FormatHTML:
       return Contains(types, Clipboard::MIME_TYPE_HTML);
     case FormatSmartPaste:
       return Contains(types, kMimeTypeWebkitSmartPaste);
     case FormatBookmark:
       // This might be difficult.
       return false;
   }
 
   return false;
 }
 
 blink::WebVector<blink::WebString> WebClipboardImpl::readAvailableTypes(
     Buffer buffer,
     bool* contains_filenames) {
   Clipboard::Type clipboard_type = ConvertBufferType(buffer);
 
   std::vector<std::string> types;
   clipboard_->GetAvailableMimeTypes(
       clipboard_type, base::Bind(&CopyVectorString, &types));
 
   // Force this to be synchronous.
-  clipboard_.WaitForIncomingMethodCall();
+  clipboard_.WaitForIncomingResponse();
 
   // AFAICT, every instance of setting contains_filenames is false.
   *contains_filenames = false;
 
   blink::WebVector<blink::WebString> output(types.size());
   for (size_t i = 0; i < types.size(); ++i) {
     output[i] = blink::WebString::fromUTF8(types[i]);
   }
 
   return output;
 }
 
 blink::WebString WebClipboardImpl::readPlainText(Buffer buffer) {
   Clipboard::Type type = ConvertBufferType(buffer);
 
   blink::WebString text;
   clipboard_->ReadMimeType(type, Clipboard::MIME_TYPE_TEXT,
                            base::Bind(&CopyWebString, &text));
 
   // Force this to be synchronous.
-  clipboard_.WaitForIncomingMethodCall();
+  clipboard_.WaitForIncomingResponse();
 
   return text;
 }
 
 blink::WebString WebClipboardImpl::readHTML(Buffer buffer,
                                             blink::WebURL* page_url,
                                             unsigned* fragment_start,
                                             unsigned* fragment_end) {
   Clipboard::Type type = ConvertBufferType(buffer);
 
   blink::WebString html;
   clipboard_->ReadMimeType(type, Clipboard::MIME_TYPE_HTML,
                            base::Bind(&CopyWebString, &html));
-  clipboard_.WaitForIncomingMethodCall();
+  clipboard_.WaitForIncomingResponse();
 
   *fragment_start = 0;
   *fragment_end = static_cast<unsigned>(html.length());
 
   clipboard_->ReadMimeType(type, Clipboard::MIME_TYPE_URL,
                            base::Bind(&CopyURL, page_url));
-  clipboard_.WaitForIncomingMethodCall();
+  clipboard_.WaitForIncomingResponse();
 
   return html;
 }
 
 blink::WebString WebClipboardImpl::readCustomData(
     Buffer buffer,
     const blink::WebString& mime_type) {
   Clipboard::Type clipboard_type = ConvertBufferType(buffer);
 
   blink::WebString data;
   clipboard_->ReadMimeType(
       clipboard_type, mime_type.utf8(), base::Bind(&CopyWebString, &data));
 
   // Force this to be synchronous.
-  clipboard_.WaitForIncomingMethodCall();
+  clipboard_.WaitForIncomingResponse();
 
   return data;
 }
 
 void WebClipboardImpl::writePlainText(const blink::WebString& plain_text) {
   Map<String, Array<uint8_t>> data;
   data[Clipboard::MIME_TYPE_TEXT] = Array<uint8_t>::From(plain_text);
 
   clipboard_->WriteClipboardData(Clipboard::TYPE_COPY_PASTE, data.Pass());
 }
@@ skipping 19 matching lines @@
       return Clipboard::TYPE_COPY_PASTE;
     case BufferSelection:
       return Clipboard::TYPE_SELECTION;
   }
 
   NOTREACHED();
   return Clipboard::TYPE_COPY_PASTE;
 }
 
 }  // namespace html_viewer