Revert https://src.chromium.org/viewvc/chrome?view=rev&revision=231330

ipc/ipc_message.cc

 // Copyright (c) 2012 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 "ipc/ipc_message.h"
 
 #include "base/atomicops.h"
 #include "base/logging.h"
 #include "build/build_config.h"
 
@@ skipping 32 matching lines @@
     : Pickle(sizeof(Header)) {
   header()->routing = header()->type = 0;
   header()->flags = GetRefNumUpper24();
 #if defined(OS_POSIX)
   header()->num_fds = 0;
   header()->pad = 0;
 #endif
   InitLoggingVariables();
 }
 
-Message::Message(int32 routing_id, uint32 type)
+Message::Message(int32 routing_id, uint32 type, PriorityValue priority)
     : Pickle(sizeof(Header)) {
   header()->routing = routing_id;
   header()->type = type;
-  header()->flags = GetRefNumUpper24();
+  DCHECK((priority & 0xffffff00) == 0);
+  header()->flags = priority | GetRefNumUpper24();
 #if defined(OS_POSIX)
   header()->num_fds = 0;
   header()->pad = 0;
 #endif
   InitLoggingVariables();
 }
 
-Message::Message(const char* data, size_t data_len)
-    : Pickle(data, data_len) {
+Message::Message(const char* data, int data_len) : Pickle(data, data_len) {
   InitLoggingVariables();
 }
 
 Message::Message(const Message& other) : Pickle(other) {
   InitLoggingVariables();
 #if defined(OS_POSIX)
   file_descriptor_set_ = other.file_descriptor_set_;
 #endif
 }
 
@@ skipping 76 matching lines @@
 }
 
 void Message::EnsureFileDescriptorSet() {
   if (file_descriptor_set_.get() == NULL)
     file_descriptor_set_ = new FileDescriptorSet;
 }
 
 #endif
 
 }  // namespace IPC