Fixing logic for using android_setsocknetwork() with bind().

webrtc/base/networkmonitor.h

 /*
  *  Copyright 2015 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.
  */
 
 #ifndef WEBRTC_BASE_NETWORKMONITOR_H_
 #define WEBRTC_BASE_NETWORKMONITOR_H_
 
 #include "webrtc/base/logging.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/thread.h"
 
 namespace rtc {
 
 class IPAddress;
 
-// Error values are negative.
-enum NetworkBindingResults {
-  NETWORK_BIND_SUCCESS = 0,   // No error
-  NETWORK_BIND_FAILURE = -1,  // Generic error
-  NETWORK_BIND_NOT_IMPLEMENTED = -2,
-  NETWORK_BIND_ADDRESS_NOT_FOUND = -3,
-  NETWORK_BIND_NETWORK_CHANGED = -4
+enum class NetworkBindingResult {
+  SUCCESS = 0,   // No error
+  FAILURE = -1,  // Generic error
+  NOT_IMPLEMENTED = -2,
+  ADDRESS_NOT_FOUND = -3,
+  NETWORK_CHANGED = -4
 };
 
 enum AdapterType {
   // This enum resembles the one in Chromium net::ConnectionType.
   ADAPTER_TYPE_UNKNOWN = 0,
   ADAPTER_TYPE_ETHERNET = 1 << 0,
   ADAPTER_TYPE_WIFI = 1 << 1,
   ADAPTER_TYPE_CELLULAR = 1 << 2,
   ADAPTER_TYPE_VPN = 1 << 3,
   ADAPTER_TYPE_LOOPBACK = 1 << 4
 };
 
 class NetworkBinderInterface {
  public:
   // Binds a socket to the network that is attached to |address| so that all
   // packets on the socket |socket_fd| will be sent via that network.
   // This is needed because some operating systems (like Android) require a
   // special bind call to put packets on a non-default network interface.
-  virtual int BindSocketToNetwork(int socket_fd, const IPAddress& address) = 0;
+  virtual NetworkBindingResult BindSocketToNetwork(
+      int socket_fd,
+      const IPAddress& address) = 0;
   virtual ~NetworkBinderInterface() {}
 };
 
 /*
  * Receives network-change events via |OnNetworksChanged| and signals the
  * networks changed event.
  *
  * Threading consideration:
  * It is expected that all upstream operations (from native to Java) are
  * performed from the worker thread. This includes creating, starting and
@@ skipping 60 matching lines @@
 
   virtual ~NetworkMonitorFactory();
 
  protected:
   NetworkMonitorFactory();
 };
 
 }  // namespace rtc
 
 #endif  // WEBRTC_BASE_NETWORKMONITOR_H_