Delete webrtc/base/common.h

webrtc/base/httpclient.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 <time.h>
 #include <algorithm>
 #include <memory>
 #include "webrtc/base/asyncsocket.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/diskcache.h"
 #include "webrtc/base/httpclient.h"
 #include "webrtc/base/httpcommon-inl.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/pathutils.h"
 #include "webrtc/base/socketstream.h"
 #include "webrtc/base/stringencode.h"
 #include "webrtc/base/stringutils.h"
 #include "webrtc/base/thread.h"
+#include "webrtc/common_types.h"
 
 namespace rtc {
 
 //////////////////////////////////////////////////////////////////////
 // Helpers
 //////////////////////////////////////////////////////////////////////
 
 namespace {
 
 const size_t kCacheHeader = 0;
@@ skipping 119 matching lines @@
 HttpRequestValidatorLevel(const HttpRequestData& request) {
   if (HV_GET != request.verb)
     return HVS_STRONG;
   return request.hasHeader(HH_RANGE, NULL) ? HVS_STRONG : HVS_WEAK;
 }
 
 HttpValidatorStrength
 HttpResponseValidatorLevel(const HttpResponseData& response) {
   std::string value;
   if (response.hasHeader(HH_ETAG, &value)) {
-    bool is_weak = (strnicmp(value.c_str(), "W/", 2) == 0);
+    bool is_weak = (STR_NCASE_CMP(value.c_str(), "W/", 2) == 0);
     return is_weak ? HVS_WEAK : HVS_STRONG;
   }
   if (response.hasHeader(HH_LAST_MODIFIED, &value)) {
     time_t last_modified, date;
     if (HttpDateToSeconds(value, &last_modified)
         && response.hasHeader(HH_DATE, &value)
         && HttpDateToSeconds(value, &date)
         && (last_modified + 60 < date)) {
       return HVS_STRONG;
     }
@@ skipping 651 matching lines @@
                                      const std::string& agent,
                                      HttpTransaction* transaction)
     : ReuseSocketPool(factory ? factory : Thread::Current()->socketserver()),
       HttpClient(agent, NULL, transaction) {
   set_pool(this);
 }
 
 //////////////////////////////////////////////////////////////////////
 
 }  // namespace rtc