Updating DCHECK() to DCHECK_GE() in base/ dir

base/mach_ipc_mac.h

 // Copyright (c) 2006-2008 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.
 
 #ifndef BASE_MACH_IPC_MAC_H_
 #define BASE_MACH_IPC_MAC_H_
 #pragma once
 
 #include <mach/mach.h>
 #include <mach/message.h>
@@ skipping 160 matching lines @@
 
   // Convenience method which gets the Mach port described by the descriptor
   mach_port_t GetTranslatedPort(int n);
 
   // A simple message is one with no descriptors
   bool IsSimpleMessage() const { return GetDescriptorCount() == 0; }
 
   // Sets raw data for the message (returns false if not enough space)
   bool SetData(const void* data, int32_t data_length);
 
+  static const size_t kEmptyMessageSize;

[Peter Kasting, 2011/03/27 19:22:59]

Nit: This actually goes at the very top, above the destructor (see
http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Declaration_Order
).  You don't need a blank line between it and the "public:" declaration.

[KushalP, 2011/03/27 20:18:28]

Done.

+
  protected:
   // Consider this an abstract base class - must create an actual instance
   // of MachReceiveMessage or MachSendMessage
   MachMessage();
 
   // Constructor for use with preallocate storage.
   // storage_length must be >= EmptyMessageSize()
   MachMessage(void *storage, size_t storage_length);
 
   friend class ReceivePort;
@@ skipping 11 matching lines @@
   void SetDescriptorCount(int n);
   void SetDescriptor(int n, const MachMsgPortDescriptor &desc);
 
   // Returns total message size setting msgh_size in the header to this value
   int CalculateSize();
 
   // Returns total storage size that this object can grow to, this is inclusive
   // of the Mach header.
   size_t MaxSize() const { return storage_length_bytes_; }
 
- protected:
   mach_msg_header_t *Head() { return &(storage_->head); }
 
  private:
   struct MachMessageData {
     mach_msg_header_t  head;
     mach_msg_body_t    body;
     // descriptors and data may be embedded here.
     u_int8_t           padding[1024];
   };
 
- // kEmptyMessageSize needs to have the definition of MachMessageData before
- // it.
- public:
-   // The size of an empty message with no data.
-  static const size_t kEmptyMessageSize = sizeof(mach_msg_header_t) +
-                                          sizeof(mach_msg_body_t) +
-                                          sizeof(MessageDataPacket);
-
- private:
   MachMessageData *storage_;
   size_t storage_length_bytes_;
   bool own_storage_;  // Is storage owned by this object?
 };
 
 //==============================================================================
 // MachReceiveMessage and MachSendMessage are useful to separate the idea
 // of a Mach message being sent and being received, and adds increased type
 // safety:
 //  ReceivePort::WaitForMessage() only accepts a MachReceiveMessage
@@ skipping 71 matching lines @@
  private:
   mach_port_t   send_port_;
   kern_return_t init_result_;
 
   DISALLOW_COPY_AND_ASSIGN(MachPortSender);
 };
 
 }  // namespace base
 
 #endif // BASE_MACH_IPC_MAC_H_