1 files changed, 9 insertions, 8 deletions
diff --git a/chromium/ipc/ipc_message.cc b/chromium/ipc/ipc_message.cc
index cf3a65e077f..1ac4d6e3026 100644
--- a/chromium/ipc/ipc_message.cc
+++ b/chromium/ipc/ipc_message.cc
@@ -4,7 +4,7 @@
 
 #include "ipc/ipc_message.h"
 
-#include "base/atomicops.h"
+#include "base/atomic_sequence_num.h"
 #include "base/logging.h"
 #include "build/build_config.h"
 
@@ -14,7 +14,7 @@
 
 namespace {
 
-base::subtle::Atomic32 g_ref_num = 0;
+base::StaticAtomicSequenceNumber g_ref_num;
 
 // Create a reference number for identifying IPC messages in traces. The return
 // values has the reference number stored in the upper 24 bits, leaving the low
@@ -22,7 +22,7 @@ base::subtle::Atomic32 g_ref_num = 0;
 inline uint32 GetRefNumUpper24() {
   base::debug::TraceLog* trace_log = base::debug::TraceLog::GetInstance();
   int32 pid = trace_log ? trace_log->process_id() : 0;
-  int32 count = base::subtle::NoBarrier_AtomicIncrement(&g_ref_num, 1);
+  int32 count = g_ref_num.GetNext();
   // The 24 bit hash is composed of 14 bits of the count and 10 bits of the
   // Process ID. With the current trace event buffer cap, the 14-bit count did
   // not appear to wrap during a trace. Note that it is not a big deal if
@@ -47,7 +47,7 @@ Message::Message()
   header()->num_fds = 0;
   header()->pad = 0;
 #endif
-  InitLoggingVariables();
+  Init();
 }
 
 Message::Message(int32 routing_id, uint32 type, PriorityValue priority)
@@ -60,21 +60,22 @@ Message::Message(int32 routing_id, uint32 type, PriorityValue priority)
   header()->num_fds = 0;
   header()->pad = 0;
 #endif
-  InitLoggingVariables();
+  Init();
 }
 
 Message::Message(const char* data, int data_len) : Pickle(data, data_len) {
-  InitLoggingVariables();
+  Init();
 }
 
 Message::Message(const Message& other) : Pickle(other) {
-  InitLoggingVariables();
+  Init();
 #if defined(OS_POSIX)
   file_descriptor_set_ = other.file_descriptor_set_;
 #endif
 }
 
-void Message::InitLoggingVariables() {
+void Message::Init() {
+  dispatch_error_ = false;
 #ifdef IPC_MESSAGE_LOG_ENABLED
   received_time_ = 0;
   dont_log_ = false;