Replace all use of the VERIFY macro.

webrtc/base/physicalsocketserver.cc

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 #include "webrtc/base/physicalsocketserver.h"
@@ skipping 120 matching lines @@
   // initialized by constructor of a static object. If neccessary libjingle
   // users can link it with a different version of this function by replacing
   // win32socketinit.cc. See win32socketinit.cc for more details.
   EnsureWinsockInit();
 #endif
   if (s_ != INVALID_SOCKET) {
     enabled_events_ = DE_READ | DE_WRITE;
 
     int type = SOCK_STREAM;
     socklen_t len = sizeof(type);
-    VERIFY(0 == getsockopt(s_, SOL_SOCKET, SO_TYPE, (SockOptArg)&type, &len));
+    int res = getsockopt(s_, SOL_SOCKET, SO_TYPE, (SockOptArg)&type, &len);
+    RTC_DCHECK (res == 0);

[kwiberg-webrtc, 2017/02/07 09:39:49]

Spurious space. Also, RTC_DCHECK_EQ?

     udp_ = (SOCK_DGRAM == type);
   }
 }
 
 PhysicalSocket::~PhysicalSocket() {
   Close();
 }
 
 bool PhysicalSocket::Create(int family, int type) {
   Close();
@@ skipping 675 matching lines @@
   ~EventDispatcher() override {
     ss_->Remove(this);
     close(afd_[0]);
     close(afd_[1]);
   }
 
   virtual void Signal() {
     CritScope cs(&crit_);
     if (!fSignaled_) {
       const uint8_t b[1] = {0};
-      if (VERIFY(1 == write(afd_[1], b, sizeof(b)))) {
+      ssize_t res = write(afd_[1], b, sizeof(b));
+      RTC_DCHECK(1 == res);
+      if (res == 1) {
         fSignaled_ = true;
       }

[kwiberg-webrtc, 2017/02/07 09:39:49]

Hmm. You're not supposed to handle DCHECK failures. So maybe do as in OnPreEvent
below?

[nisse-webrtc, 2017/02/07 10:48:15]

I'm deleting the if. And changing to const and DCHECK_EQ.

     }
   }
 
   uint32_t GetRequestedEvents() override { return DE_READ; }
 
   void OnPreEvent(uint32_t ff) override {
     // It is not possible to perfectly emulate an auto-resetting event with
     // pipes.  This simulates it by resetting before the event is handled.
 
     CritScope cs(&crit_);
     if (fSignaled_) {
       uint8_t b[4];  // Allow for reading more than 1 byte, but expect 1.
-      VERIFY(1 == read(afd_[0], b, sizeof(b)));
+      ssize_t res = read(afd_[0], b, sizeof(b));

[kwiberg-webrtc, 2017/02/07 09:39:49]

const? (You don't *have* to, but I recommend const wherever possible...)

[nisse-webrtc, 2017/02/07 10:48:15]

Done.

+      RTC_DCHECK(1 == res);

[kwiberg-webrtc, 2017/02/07 09:39:49]

RTC_DCHECK_EQ, especially if you want the arguments in that order.

[nisse-webrtc, 2017/02/07 10:48:15]

Done.

       fSignaled_ = false;
     }
   }
 
   void OnEvent(uint32_t ff, int err) override { RTC_NOTREACHED(); }
 
   int GetDescriptor() override { return afd_[0]; }
 
   bool IsDescriptorClosed() override { return false; }
 
@@ skipping 733 matching lines @@
        break;
     }
   }
 
   // Done
   return true;
 }
 #endif  // WEBRTC_WIN
 
 }  // namespace rtc