From 0b6293e2f5b54dbc196d9a00d3dab6a097528ba2 Mon Sep 17 00:00:00 2001
From: Samuel Attard <samuel.r.attard@gmail.com>
Date: Tue, 19 Dec 2017 10:55:40 +1100
Subject: [PATCH] Pickle write methods now return void and use GE_CHECK instead

---
 .../pepper_flash_clipboard_message_filter.cc   | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc b/chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc
index 20f4957a3b5f..000cf56771c4 100644
--- a/chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc
+++ b/chromium_src/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc
@@ -83,18 +83,15 @@ std::string ReadDataFromPickle(const base::string16& format,
   return result;
 }
 
-bool WriteDataToPickle(const std::map<base::string16, std::string>& data,
+void WriteDataToPickle(const std::map<base::string16, std::string>& data,
                        base::Pickle* pickle) {
   pickle->WriteUInt32(data.size());
   for (std::map<base::string16, std::string>::const_iterator it = data.begin();
        it != data.end();
        ++it) {
-    if (!pickle->WriteString16(it->first))
-      return false;
-    if (!pickle->WriteString(it->second))
-      return false;
+    pickle->WriteString16(it->first);
+    pickle->WriteString(it->second);
   }
-  return true;
 }
 
 }  // namespace
@@ -344,12 +341,9 @@ int32_t PepperFlashClipboardMessageFilter::OnMsgWriteData(
 
   if (custom_data_map.size() > 0) {
     base::Pickle pickle;
-    if (WriteDataToPickle(custom_data_map, &pickle)) {
-      scw.WritePickledData(pickle,
-                           ui::Clipboard::GetPepperCustomDataFormatType());
-    } else {
-      res = PP_ERROR_BADARGUMENT;
-    }
+    WriteDataToPickle(custom_data_map, &pickle);
+    scw.WritePickledData(pickle,
+                         ui::Clipboard::GetPepperCustomDataFormatType());
   }
 
   if (res != PP_OK) {