Update from https://crrev.com/333737

mojo/edk/system/message_pipe_perftest.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 <stdint.h>
 #include <stdio.h>
 #include <string.h>
 
 #include <string>
 #include <vector>
@@ skipping 22 matching lines @@
 namespace {
 
 class MultiprocessMessagePipePerfTest
     : public test::MultiprocessMessagePipeTestBase {
  public:
   MultiprocessMessagePipePerfTest() : message_count_(0), message_size_(0) {}
 
   void SetUpMeasurement(int message_count, size_t message_size) {
     message_count_ = message_count;
     message_size_ = message_size;
-    payload_ = Pickle();
+    payload_ = base::Pickle();
     payload_.WriteString(std::string(message_size, '*'));
     read_buffer_.resize(message_size * 2);
   }
 
  protected:
   void WriteWaitThenRead(scoped_refptr<MessagePipe> mp) {
     CHECK_EQ(mp->WriteMessage(0, UserPointer<const void>(payload_.data()),
                               static_cast<uint32_t>(payload_.size()), nullptr,
                               MOJO_WRITE_MESSAGE_FLAG_NONE),
              MOJO_RESULT_OK);
@@ skipping 25 matching lines @@
 
     for (int i = 0; i < message_count_; ++i)
       WriteWaitThenRead(mp);
 
     logger.Done();
   }
 
  private:
   int message_count_;
   size_t message_size_;
-  Pickle payload_;
+  base::Pickle payload_;
   std::string read_buffer_;
   scoped_ptr<base::PerfTimeLogger> perf_logger_;
 };
 
 // For each message received, sends a reply message with the same contents
 // repeated twice, until the other end is closed or it receives "quitquitquit"
 // (which it doesn't reply to). It'll return the number of messages received,
 // not including any "quitquitquit" message, modulo 100.
 MOJO_MULTIPROCESS_TEST_CHILD_MAIN(PingPongClient) {
   embedder::SimplePlatformSupport platform_support;
@@ skipping 63 matching lines @@
   }
 
   SendQuitMessage(mp);
   mp->Close(0);
   EXPECT_EQ(0, helper()->WaitForChildShutdown());
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo