Delete webrtc/base/common.h

webrtc/base/proxydetect.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.
  */
 
@@ skipping 16 matching lines @@
 #ifdef WEBRTC_IOS
 #include <CFNetwork/CFNetwork.h>
 #include "macconversion.h"
 #endif
 
 #include <map>
 #include <memory>
 
 #include "webrtc/base/arraysize.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/fileutils.h"
 #include "webrtc/base/httpcommon.h"
 #include "webrtc/base/httpcommon-inl.h"
 #include "webrtc/base/pathutils.h"
 #include "webrtc/base/stringutils.h"
+#include "webrtc/common_types.h"
 
 #define _TRY_JSPROXY 0
 #define _TRY_WM_FINDPROXY 0
 
 #if defined(WEBRTC_WIN)
 #define _TRY_WINHTTP 1
 #define _TRY_IE_LAN_SETTINGS 1
 #else
 #define _TRY_WINHTTP 0
 #define _TRY_IE_LAN_SETTINGS 0
@@ skipping 175 matching lines @@
     SocketAddress addr(url.host(), 0);
     // TODO: Support IPv6 proxyitems. This code block is IPv4 only anyway.
     return !addr.IsUnresolvedIP() &&
         ((addr.ipaddr().v4AddressAsHostOrderInteger() & mask) == (ip & mask));
   }
 
   // .foo.com
   if (*item == '.') {
     size_t hostlen = url.host().length();
     return (hostlen > len)
-        && (stricmp(url.host().c_str() + (hostlen - len), item) == 0);
+        && (STR_CASE_CMP(url.host().c_str() + (hostlen - len), item) == 0);
   }
 
   // localhost or www.*.com
   if (!string_match(url.host().c_str(), item))
     return false;
 
   return true;
 }
 
 bool ProxyListMatch(const Url<char>& url, const std::string& proxy_list,
@@ skipping 1034 matching lines @@
     if (!result) {
       // Either auto detection is not supported or we simply didn't
       // find any proxy, reset type.
       proxy->type = rtc::PROXY_NONE;
     }
   }
   return result;
 }
 
 }  // namespace rtc