Refactor PickleIterator.

chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc

Index: chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc
===================================================================
--- chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc	(revision 271871)
+++ chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc	(working copy)
@@ -142,10 +142,8 @@
 
  protected:
   std::string FormatMessage(const std::string& message) {
-    Pickle pickle;
-    pickle.WriteString(message);
-    return std::string(const_cast<const Pickle*>(&pickle)->payload(),
-                       pickle.payload_size());
+    uint32_t length = message.length();
+    return std::string(reinterpret_cast<char*>(&length), 4).append(message);

[jar (doing other things), 2014/05/22 02:51:00]

The original code is confusing for other reasons... like why would you use const
cast to add const-ness?

...but why can't that code still work?.... and why are you providing a separate
implementation of the writing of a string (message) here? Why isn't the other
code still functional?

[halyavin, 2014/05/22 04:05:25]

I made Pickle payload size aligned to 4 bytes and hence the resulting string had
extra zeros at the end.

[jar (doing other things), 2014/05/23 21:22:04]

Yes... SGTM.  thx.

   }
 
   base::FilePath CreateTempFileWithMessage(const std::string& message) {